@pisell/pisellos 2.3.50 → 2.3.53

package/dist/modules/Order/index.js

@@ -32,7 +32,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
@@ -309,8 +309,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _appPlugin$getApp, _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var appPlugin, app, otherParams;
+        var _otherParams$rules, _otherParams$order, _otherParams$hooks;
+        var app, otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -326,12 +326,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.availableWalletIds = [];
               }
               this.request = this.core.getPlugin('request');
-              appPlugin = this.core.getPlugin('app');
-              if (!appPlugin) {
-                console.error('Order 模块需要 app 插件支持');
+              this.appPlugin = this.core.getPlugin('app');
+              if (this.appPlugin) {
+                _context.next = 9;
+                break;
               }
-              app = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp) === null || _appPlugin$getApp === void 0 ? void 0 : _appPlugin$getApp.call(appPlugin);
-              this.logger = app === null || app === void 0 ? void 0 : app.logger;
+              throw new Error('Order 模块需要 app 插件支持');
+            case 9:
+              app = this.appPlugin.getApp();
+              this.logger = app.logger;
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
               this.cacheId = otherParams.cacheId;
@@ -342,7 +345,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -1273,16 +1276,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function persistTempOrder() {
       // no-op: OrderModule 的刷新恢复不再依赖 localStorage。
     }
-  }, {
-    key: "notifyTempOrderChanged",
-    value: function notifyTempOrderChanged() {
-      if (!this.store.tempOrder) return;
-      this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
-        products: _toConsumableArray(this.store.tempOrder.products),
-        bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
-      });
-      this.persistTempOrder();
-    }
 
     // ─── TempOrder: 创建 & 获取 ───
   }, {
@@ -3883,11 +3876,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "appendProductLineToTempOrder",
     value: (function () {
-      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(tempOrder, product, booking) {
-        var _booking_uid,
+      var _appendProductLineToTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(tempOrder, product, booking, options) {
+        var _normalizedIncoming$p,
+          _normalizedIncoming$p2,
+          _booking_uid,
           _metadata,
           _this26 = this;
-        var linked, productToAdd, incomingFingerprint, normalizedIncoming, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
+        var linked, productToAdd, incomingFingerprint, normalizedIncoming, isWeighingProduct, netWeight, incomingBookingUid, hasIncomingGoodPass, hasIncomingProductNote, hasIncomingBookingUid, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, insertAtIndex, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList, mergedProduct;
         return _regeneratorRuntime().wrap(function _callee20$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -3898,6 +3893,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               productToAdd = (linked === null || linked === void 0 ? void 0 : linked.product) || product;
               incomingFingerprint = buildProductLineFingerprint(getProductSkuOptions(productToAdd), productToAdd.product_bundle);
               normalizedIncoming = mergeOrderProductDisplayFields(productToAdd, normalizeOrderProduct(productToAdd));
+              isWeighingProduct = Number(((_normalizedIncoming$p = normalizedIncoming.product_sku) === null || _normalizedIncoming$p === void 0 ? void 0 : _normalizedIncoming$p.open_sold_weight) || 0) === 1;
+              netWeight = Number((_normalizedIncoming$p2 = normalizedIncoming.product_sku) === null || _normalizedIncoming$p2 === void 0 ? void 0 : _normalizedIncoming$p2.net_weight);
+              if (!(isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0))) {
+                _context22.next = 8;
+                break;
+              }
+              throw new Error('[Order] 称重商品净重必须大于 0');
+            case 8:
               incomingBookingUid = (_booking_uid = productToAdd.booking_uid) !== null && _booking_uid !== void 0 ? _booking_uid : (_metadata = productToAdd.metadata) === null || _metadata === void 0 ? void 0 : _metadata.booking_uid;
               if (incomingBookingUid !== undefined && incomingBookingUid !== null && String(incomingBookingUid) !== '') {
                 normalizedIncoming.booking_uid = String(incomingBookingUid);
@@ -3909,7 +3912,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               hasIncomingGoodPass = this.hasGoodPassDiscount(normalizedIncoming);
               hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
               hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+              shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
                 var _item$metadata3;
                 if (_this26.hasGoodPassDiscount(item)) return false;
@@ -3924,10 +3927,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               matchedProduct = matchedIndex === -1 ? null : tempOrder.products[matchedIndex];
               existedFingerprint = matchedProduct ? buildProductLineFingerprint(getProductSkuOptions(matchedProduct), matchedProduct.product_bundle) : '';
               if (!matchedProduct) {
-                _context22.next = 20;
+                _context22.next = 24;
                 break;
               }
-              _context22.next = 17;
+              _context22.next = 21;
               return this.shouldMergeProductToOrder({
                 incomingProduct: productToAdd,
                 normalizedIncoming: normalizedIncoming,
@@ -3938,13 +3941,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder,
                 booking: booking
               });
-            case 17:
+            case 21:
               _context22.t0 = _context22.sent;
-              _context22.next = 21;
+              _context22.next = 25;
               break;
-            case 20:
+            case 24:
               _context22.t0 = false;
-            case 21:
+            case 25:
               shouldMerge = _context22.t0;
               if (matchedIndex === -1 || !matchedProduct || !shouldMerge) {
                 this.captureProductRuntime(tempOrder, productToAdd, normalizedIncoming);
@@ -3954,8 +3957,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     booking_uid: linked.bookingUid
                   });
                 }
-                // tempOrder.products.push(normalizedIncoming);
-                tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+                insertAtIndex = options === null || options === void 0 ? void 0 : options.insertAtIndex;
+                if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, insertAtIndex)), [normalizedIncoming], _toConsumableArray(tempOrder.products.slice(insertAtIndex)));
+                } else {
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products), [normalizedIncoming]);
+                }
               } else {
                 targetProduct = matchedProduct;
                 targetUid = (_targetProduct$metada = targetProduct.metadata) === null || _targetProduct$metada === void 0 ? void 0 : _targetProduct$metada.unique_identification_number;
@@ -3993,17 +4000,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   num: nextNum
                 });
                 this.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
+                if (matchedIndex !== tempOrder.products.length - 1) {
+                  mergedProduct = tempOrder.products[matchedIndex];
+                  tempOrder.products = [].concat(_toConsumableArray(tempOrder.products.slice(0, matchedIndex)), _toConsumableArray(tempOrder.products.slice(matchedIndex + 1)), [mergedProduct]);
+                }
               }
               if (linked) {
                 tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
               }
-            case 24:
+            case 28:
             case "end":
               return _context22.stop();
           }
         }, _callee20, this);
       }));
-      function appendProductLineToTempOrder(_x22, _x23, _x24) {
+      function appendProductLineToTempOrder(_x22, _x23, _x24, _x25) {
         return _appendProductLineToTempOrder.apply(this, arguments);
       }
       return appendProductLineToTempOrder;
@@ -4019,61 +4030,74 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProductToOrder",
     value: (function () {
-      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(product, booking) {
-        var tempOrder, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
+      var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(product, booking, options) {
+        var tempOrder, insertAfterProductUid, anchorIndex, insertAtIndex, _ref61, _productRecord$num, productRecord, splitCount, i, singleLine;
         return _regeneratorRuntime().wrap(function _callee21$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
+              insertAfterProductUid = options === null || options === void 0 ? void 0 : options.insertAfterProductUid;
+              anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex(function (line) {
+                var _line$metadata;
+                var uid = ((_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.unique_identification_number) || line.unique_identification_number;
+                return uid !== undefined && uid !== null && String(uid) === String(insertAfterProductUid);
+              }) : -1;
+              insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : undefined;
               if (!booking) {
-                _context23.next = 18;
+                _context23.next = 22;
                 break;
               }
               productRecord = product;
               splitCount = getSafeProductNum((_ref61 = (_productRecord$num = productRecord.num) !== null && _productRecord$num !== void 0 ? _productRecord$num : productRecord.product_quantity) !== null && _ref61 !== void 0 ? _ref61 : 1);
               if (!(splitCount > 1)) {
-                _context23.next = 18;
+                _context23.next = 22;
                 break;
               }
               i = 0;
-            case 6:
+            case 9:
               if (!(i < splitCount)) {
-                _context23.next = 15;
+                _context23.next = 19;
                 break;
               }
               singleLine = cloneDeep(productRecord);
               singleLine.num = 1;
               delete singleLine.product_quantity;
-              _context23.next = 12;
-              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking));
-            case 12:
+              _context23.next = 15;
+              return this.appendProductLineToTempOrder(tempOrder, singleLine, cloneDeep(booking), {
+                insertAtIndex: insertAtIndex
+              });
+            case 15:
+              if (insertAtIndex !== undefined) insertAtIndex += 1;
+            case 16:
               i += 1;
-              _context23.next = 6;
+              _context23.next = 9;
               break;
-            case 15:
-              _context23.next = 17;
+            case 19:
+              _context23.next = 21;
               return this.finalizeProductOrderMutation(tempOrder);
-            case 17:
+            case 21:
               return _context23.abrupt("return", tempOrder.products);
-            case 18:
-              _context23.next = 20;
-              return this.appendProductLineToTempOrder(tempOrder, product, booking);
-            case 20:
-              _context23.next = 22;
-              return this.finalizeProductOrderMutation(tempOrder);
             case 22:
+              _context23.next = 24;
+              return this.appendProductLineToTempOrder(tempOrder, product, booking, {
+                insertAtIndex: insertAtIndex
+              });
+            case 24:
+              _context23.next = 26;
+              return this.finalizeProductOrderMutation(tempOrder);
+            case 26:
               this.logInfo('addProductToOrder success', {
                 product_id: product.product_id,
                 with_booking: !!booking
               });
               return _context23.abrupt("return", tempOrder.products);
-            case 24:
+            case 28:
             case "end":
               return _context23.stop();
           }
         }, _callee21, this);
       }));
-      function addProductToOrder(_x25, _x26) {
+      function addProductToOrder(_x26, _x27, _x28) {
         return _addProductToOrder.apply(this, arguments);
       }
       return addProductToOrder;
@@ -4177,7 +4201,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee22, this, [[4, 32, 35, 38]]);
       }));
-      function addProductsToOrder(_x27, _x28) {
+      function addProductsToOrder(_x29, _x30) {
         return _addProductsToOrder.apply(this, arguments);
       }
       return addProductsToOrder;
@@ -4452,7 +4476,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee23, this);
       }));
-      function updateOrderProduct(_x29) {
+      function updateOrderProduct(_x31) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4496,7 +4520,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function updateOrderProducts(_x30) {
+      function updateOrderProducts(_x32) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4572,7 +4596,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this);
       }));
-      function updateOrderProductQuantity(_x31) {
+      function updateOrderProductQuantity(_x33) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4637,7 +4661,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this);
       }));
-      function finalizeAfterProductsMutation(_x32, _x33) {
+      function finalizeAfterProductsMutation(_x34, _x35) {
         return _finalizeAfterProductsMutation.apply(this, arguments);
       }
       return finalizeAfterProductsMutation;
@@ -4652,9 +4676,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductsFromOrder",
     value: (function () {
-      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identities) {
+      var _removeProductsFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identities, options) {
         var _this29 = this;
-        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3;
+        var tempOrder, productsBeforeRemove, bookingsBeforeRemove, preserveDisplayPosition, anchorIndex, productsAfterAnchor, matchedProducts, removedProducts, _i2, _removedProducts, product, linkedBookingUidsToRemove, _iterator21, _step21, _loop3, remainingProductIndex, remainingProduct, nextProduct, productsWithoutRemaining, nextProductIndex;
         return _regeneratorRuntime().wrap(function _callee27$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -4667,6 +4691,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 3:
               productsBeforeRemove = tempOrder.products || [];
               bookingsBeforeRemove = tempOrder.bookings || [];
+              preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
+              anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex(function (item) {
+                var _item$metadata6;
+                var uid = ((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number;
+                return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
+              }) : -1;
+              productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
               matchedProducts = productsBeforeRemove.filter(function (item) {
                 return identities.some(function (identity) {
                   return isIdentityMatch(item, identity);
@@ -4686,7 +4717,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               linkedBookingUidsToRemove = new Set();
               _iterator21 = _createForOfIteratorHelper(matchedProducts);
-              _context30.prev = 11;
+              _context30.prev = 14;
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var _metadata11, _metadata12, _metadata13, _metadata14;
                 var product, productUid, productBookingUid, isAddTimeProduct;
@@ -4721,56 +4752,72 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }, _loop3);
               });
               _iterator21.s();
-            case 14:
+            case 17:
               if ((_step21 = _iterator21.n()).done) {
-                _context30.next = 20;
+                _context30.next = 23;
                 break;
               }
-              return _context30.delegateYield(_loop3(), "t0", 16);
-            case 16:
+              return _context30.delegateYield(_loop3(), "t0", 19);
+            case 19:
               if (!_context30.t0) {
-                _context30.next = 18;
+                _context30.next = 21;
                 break;
               }
-              return _context30.abrupt("continue", 18);
-            case 18:
-              _context30.next = 14;
+              return _context30.abrupt("continue", 21);
+            case 21:
+              _context30.next = 17;
               break;
-            case 20:
-              _context30.next = 25;
+            case 23:
+              _context30.next = 28;
               break;
-            case 22:
-              _context30.prev = 22;
-              _context30.t1 = _context30["catch"](11);
-              _iterator21.e(_context30.t1);
             case 25:
               _context30.prev = 25;
-              _iterator21.f();
-              return _context30.finish(25);
+              _context30.t1 = _context30["catch"](14);
+              _iterator21.e(_context30.t1);
             case 28:
+              _context30.prev = 28;
+              _iterator21.f();
+              return _context30.finish(28);
+            case 31:
               if (linkedBookingUidsToRemove.size > 0) {
                 // 删除主预约商品时，同步移除挂在同一 booking_uid 下的加时商品，避免残留孤儿行。
                 tempOrder.products = (tempOrder.products || []).filter(function (line) {
-                  var _line$metadata, _line$metadata2, _line$metadata3;
-                  var lineBookingUid = (line === null || line === void 0 || (_line$metadata = line.metadata) === null || _line$metadata === void 0 ? void 0 : _line$metadata.booking_uid) || (line === null || line === void 0 ? void 0 : line.booking_uid);
-                  var isAddTimeProduct = (line === null || line === void 0 || (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.product_add_schedule_time) !== undefined && (line === null || line === void 0 || (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.product_add_schedule_time) !== null;
+                  var _line$metadata2, _line$metadata3, _line$metadata4;
+                  var lineBookingUid = (line === null || line === void 0 || (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.booking_uid) || (line === null || line === void 0 ? void 0 : line.booking_uid);
+                  var isAddTimeProduct = (line === null || line === void 0 || (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.product_add_schedule_time) !== undefined && (line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.product_add_schedule_time) !== null;
                   return !(isAddTimeProduct && lineBookingUid !== undefined && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
                 });
               }
-              _context30.next = 31;
+              if (preserveDisplayPosition && anchorIndex >= 0) {
+                remainingProductIndex = tempOrder.products.findIndex(function (item) {
+                  var _item$metadata7;
+                  var uid = ((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number;
+                  return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
+                });
+                if (remainingProductIndex >= 0) {
+                  remainingProduct = tempOrder.products[remainingProductIndex];
+                  nextProduct = productsAfterAnchor.find(function (item) {
+                    return tempOrder.products.includes(item);
+                  });
+                  productsWithoutRemaining = [].concat(_toConsumableArray(tempOrder.products.slice(0, remainingProductIndex)), _toConsumableArray(tempOrder.products.slice(remainingProductIndex + 1)));
+                  nextProductIndex = nextProduct ? productsWithoutRemaining.indexOf(nextProduct) : -1;
+                  tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
+                }
+              }
+              _context30.next = 35;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 31:
+            case 35:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context30.abrupt("return", tempOrder.products);
-            case 33:
+            case 37:
             case "end":
               return _context30.stop();
           }
-        }, _callee27, this, [[11, 22, 25, 28]]);
+        }, _callee27, this, [[14, 25, 28, 31]]);
       }));
-      function removeProductsFromOrder(_x34) {
+      function removeProductsFromOrder(_x36, _x37) {
         return _removeProductsFromOrder.apply(this, arguments);
       }
       return removeProductsFromOrder;
@@ -4778,18 +4825,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeProductFromOrder",
     value: function () {
-      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity) {
+      var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity, options) {
         return _regeneratorRuntime().wrap(function _callee28$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              return _context31.abrupt("return", this.removeProductsFromOrder([identity]));
+              return _context31.abrupt("return", this.removeProductsFromOrder([identity], options));
             case 1:
             case "end":
               return _context31.stop();
           }
         }, _callee28, this);
       }));
-      function removeProductFromOrder(_x35) {
+      function removeProductFromOrder(_x38, _x39) {
         return _removeProductFromOrder.apply(this, arguments);
       }
       return removeProductFromOrder;
@@ -4901,7 +4948,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function applyLocalPrintOrderNumbers(_x36) {
+      function applyLocalPrintOrderNumbers(_x40) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4968,7 +5015,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee31, this);
       }));
-      function saveTempOrderAsDraft(_x37) {
+      function saveTempOrderAsDraft(_x41) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -4993,7 +5040,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee32, this);
       }));
-      function submitTempOrder(_x38) {
+      function submitTempOrder(_x42) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5014,7 +5061,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function submitTempOrderAsync(_x39) {
+      function submitTempOrderAsync(_x43) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5184,7 +5231,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee34, this, [[26, 33]]);
       }));
-      function runSubmitTempOrder(_x40) {
+      function runSubmitTempOrder(_x44) {
         return _runSubmitTempOrder.apply(this, arguments);
       }
       return runSubmitTempOrder;
@@ -5211,7 +5258,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function markLocalOrderSynced(_x41, _x42) {
+      function markLocalOrderSynced(_x45, _x46) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5287,7 +5334,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this31 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
         return _regeneratorRuntime().wrap(function _callee36$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -5340,7 +5387,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              submitParams = {
+              _context39.next = 29;
+              return this.submitTempOrder({
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
@@ -5353,34 +5401,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   });
                   return nextPayload;
                 }
-              };
-              if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context39.next = 34;
-                break;
-              }
-              _context39.next = 31;
-              return this.submitTempOrderAsync(submitParams);
-            case 31:
-              _context39.t1 = _context39.sent;
-              _context39.next = 37;
-              break;
-            case 34:
-              _context39.next = 36;
-              return this.submitTempOrder(submitParams);
-            case 36:
-              _context39.t1 = _context39.sent;
-            case 37:
-              submitResult = _context39.t1;
+              });
+            case 29:
+              submitResult = _context39.sent;
               return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 39:
+            case 31:
             case "end":
               return _context39.stop();
           }
         }, _callee36, this);
       }));
-      function syncPaymentsToOrder(_x43) {
+      function syncPaymentsToOrder(_x47) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5388,7 +5421,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this32 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5400,13 +5432,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         schedule_date: '',
         is_deposit: 0,
         relation_products: [],
-        relation_forms: [],
-        business_code: params === null || params === void 0 ? void 0 : params.business_code
+        relation_forms: []
       }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
-          var _params$extraData;
           if (!item._origin.duration) {
             var _generateDuration = generateDuration(item),
               duration = _generateDuration.duration,
@@ -5418,11 +5448,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var discountList = getAllDiscountList(item);
           item._origin.product.discount_list = discountList;
 
-          // 为预约补齐 holder 信息
-          if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this32.window);
-          }
-
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;
@@ -5508,7 +5533,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this);
       }));
-      function submitOrder(_x44) {
+      function submitOrder(_x48) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5547,7 +5572,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function cancelOrder(_x45) {
+      function cancelOrder(_x49) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5591,7 +5616,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function changeBookingStatus(_x46) {
+      function changeBookingStatus(_x50) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5738,7 +5763,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee40, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x47) {
+      function createOrderByCheckout(_x51) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -5763,7 +5788,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function submitSalesOrder(_x48) {
+      function submitSalesOrder(_x52) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5807,7 +5832,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function sendCustomerPayLink(_x49) {
+      function sendCustomerPayLink(_x53) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5851,7 +5876,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this);
       }));
-      function getSalesOrderByLookup(_x50) {
+      function getSalesOrderByLookup(_x54) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5966,7 +5991,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee44, this);
       }));
-      function hydrateTempOrderFromRecord(_x51, _x52) {
+      function hydrateTempOrderFromRecord(_x55, _x56) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6080,7 +6105,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this33 = this;
+      var _this32 = this;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6104,12 +6129,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this33.normalizeHydratedOrderProduct(p, {
+        return _this32.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this33.normalizeHydratedBookingHolder(b || {});
+        var booking = _this32.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6296,7 +6321,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this34 = this;
+      var _this33 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6304,7 +6329,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this34.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this33.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];
@@ -6361,7 +6386,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee45, this);
       }));
-      function getOrderInfo(_x53) {
+      function getOrderInfo(_x57) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;