@pisell/pisellos 2.3.51 → 2.3.54

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -134,9 +134,11 @@ function resolveMainProductPrice(product, fallback) {
 }
 function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map(function (item) {
-    var _ref7, _item$original_price;
+    var _ref7, _ref8, _item$original_price;
     return _objectSpread(_objectSpread({}, item), {}, {
-      original_price: (_ref7 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.bundle_selling_price) !== null && _ref7 !== void 0 ? _ref7 : item.price
+      // 后端历史订单可能没有 original_price；此时 price 是折前毛价，
+      // bundle_selling_price 已包含折扣，不能把它当成编辑时的新原价。
+      original_price: (_ref7 = (_ref8 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.product_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : item.bundle_selling_price
     });
   });
 }
@@ -167,10 +169,10 @@ function synthesizeProductResourceFromBooking(booking) {
   });
   if (relationIdsByForm.size === 0) return undefined;
   return {
-    resources: Array.from(relationIdsByForm.entries()).map(function (_ref8) {
-      var _ref9 = _slicedToArray(_ref8, 2),
-        formId = _ref9[0],
-        relationIds = _ref9[1];
+    resources: Array.from(relationIdsByForm.entries()).map(function (_ref9) {
+      var _ref10 = _slicedToArray(_ref9, 2),
+        formId = _ref10[0],
+        relationIds = _ref10[1];
       return {
         id: formId,
         status: 1,
@@ -190,7 +192,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref12, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -225,7 +227,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     product_cover: productCover,
-    note: (_ref10 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref10 !== void 0 ? _ref10 : '',
+    note: (_ref11 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref11 !== void 0 ? _ref11 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -260,7 +262,7 @@ export function buildCacheItemFromOrderLine(input) {
   var base = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref11 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    extension_type: (_ref12 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref12 !== void 0 ? _ref12 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
@@ -274,7 +276,7 @@ export function buildCacheItemFromOrderLine(input) {
     new: 0,
     autoClose: false,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    booking_id: (_ref12 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref12 !== void 0 ? _ref12 : 0
+    booking_id: (_ref13 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref13 !== void 0 ? _ref13 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

package/dist/modules/Order/index.d.ts

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
-import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
+import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions } from './types';
 import type { ICustomer } from '../AccountList/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -385,7 +385,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
      * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
      */
-    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput): Promise<OrderProduct[]>;
+    addProductToOrder(product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<OrderProduct[]>;
     /**
      * 批量添加商品行，所有行追加完成后只触发一次促销、折扣、summary 重算与持久化。
      *
@@ -423,8 +423,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * @example
      * await order.removeProductsFromOrder([identityA, identityB]);
      */
-    removeProductsFromOrder(identities: OrderProductIdentity[]): Promise<OrderProduct[]>;
-    removeProductFromOrder(identity: OrderProductIdentity): Promise<OrderProduct[]>;
+    removeProductsFromOrder(identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
+    removeProductFromOrder(identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions): Promise<OrderProduct[]>;
     /**
      * 仅清空购物车行（products / bookings），不重置整单。
      * 用于「仅清空商品」；客户、备注、支付等协议字段保持不变。
@@ -487,7 +487,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -563,4 +563,4 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     getOrderInfo(order_id: number): Promise<any>;
     getVouchers(): any[];
 }
-export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';
+export type { AddProductToOrderOptions, RemoveProductsFromOrderOptions, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';

package/dist/modules/Order/index.js

@@ -3883,11 +3883,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 +3900,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 +3919,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 +3934,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 +3948,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 +3964,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 +4007,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 +4037,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 +4208,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 +4483,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee23, this);
       }));
-      function updateOrderProduct(_x29) {
+      function updateOrderProduct(_x31) {
         return _updateOrderProduct.apply(this, arguments);
       }
       return updateOrderProduct;
@@ -4496,7 +4527,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee24, this);
       }));
-      function updateOrderProducts(_x30) {
+      function updateOrderProducts(_x32) {
         return _updateOrderProducts.apply(this, arguments);
       }
       return updateOrderProducts;
@@ -4572,7 +4603,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee25, this);
       }));
-      function updateOrderProductQuantity(_x31) {
+      function updateOrderProductQuantity(_x33) {
         return _updateOrderProductQuantity.apply(this, arguments);
       }
       return updateOrderProductQuantity;
@@ -4637,7 +4668,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 +4683,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 +4698,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 +4724,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 +4759,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 +4832,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 +4955,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee30, this);
       }));
-      function applyLocalPrintOrderNumbers(_x36) {
+      function applyLocalPrintOrderNumbers(_x40) {
         return _applyLocalPrintOrderNumbers.apply(this, arguments);
       }
       return applyLocalPrintOrderNumbers;
@@ -4968,7 +5022,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee31, this);
       }));
-      function saveTempOrderAsDraft(_x37) {
+      function saveTempOrderAsDraft(_x41) {
         return _saveTempOrderAsDraft.apply(this, arguments);
       }
       return saveTempOrderAsDraft;
@@ -4993,7 +5047,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee32, this);
       }));
-      function submitTempOrder(_x38) {
+      function submitTempOrder(_x42) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
@@ -5014,7 +5068,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee33, this);
       }));
-      function submitTempOrderAsync(_x39) {
+      function submitTempOrderAsync(_x43) {
         return _submitTempOrderAsync.apply(this, arguments);
       }
       return submitTempOrderAsync;
@@ -5184,7 +5238,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 +5265,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee35, this);
       }));
-      function markLocalOrderSynced(_x41, _x42) {
+      function markLocalOrderSynced(_x45, _x46) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -5380,7 +5434,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee36, this);
       }));
-      function syncPaymentsToOrder(_x43) {
+      function syncPaymentsToOrder(_x47) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -5508,7 +5562,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee37, this);
       }));
-      function submitOrder(_x44) {
+      function submitOrder(_x48) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -5547,7 +5601,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee38, this);
       }));
-      function cancelOrder(_x45) {
+      function cancelOrder(_x49) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -5591,7 +5645,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee39, this);
       }));
-      function changeBookingStatus(_x46) {
+      function changeBookingStatus(_x50) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -5738,7 +5792,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 +5817,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee41, this);
       }));
-      function submitSalesOrder(_x48) {
+      function submitSalesOrder(_x52) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -5807,7 +5861,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee42, this);
       }));
-      function sendCustomerPayLink(_x49) {
+      function sendCustomerPayLink(_x53) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -5851,7 +5905,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee43, this);
       }));
-      function getSalesOrderByLookup(_x50) {
+      function getSalesOrderByLookup(_x54) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -5966,7 +6020,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee44, this);
       }));
-      function hydrateTempOrderFromRecord(_x51, _x52) {
+      function hydrateTempOrderFromRecord(_x55, _x56) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -6361,7 +6415,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee45, this);
       }));
-      function getOrderInfo(_x53) {
+      function getOrderInfo(_x57) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;