@pisell/pisellos 2.3.51 → 2.3.54

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -468,11 +468,13 @@ function getProductLineNoteSignature(product) {
 }
 
 /**
- * 编辑订单时，历史行仍参与整车促销评估，但不能与本次新增行合并。
- * 以历史行 uid 作为促销前后的行边界；新增行返回空边界，仍保留原有合并语义。
+ * 称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$metadata3;
+  var _product$product_sku, _product$metadata3;
+  if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
+    return "weighing:".concat(getOrderProductUid(product));
+  }
   if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
   return "edit:".concat(getOrderProductUid(product));
 }

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 5 | 2 | 1 | 6 | 4 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingTicket/types.d.ts

@@ -118,12 +118,15 @@ export interface BookingTicketCartBookingView extends ISalesBooking {
         canAddTime: boolean;
     };
 }
+export type BookingTicketCartLineView = BookingTicketCartBookingView | BookingTicketCartItemView;
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
     bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
+    /** 以 tempOrder.products 为唯一顺序真源的统一购物车行（旧到新）。 */
+    lines: BookingTicketCartLineView[];
 }
 /**
  * BookingTicket 面向 UI 的客户展示视图。

package/dist/solution/BookingTicket/utils/cartView.js

@@ -108,33 +108,28 @@ export function buildCartView(lines, bookings) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var productLines = Array.isArray(lines) ? lines : [];
   var bookingList = Array.isArray(bookings) ? bookings : [];
+  var childBookings = bookingList.filter(function (booking) {
+    return booking.parent_id !== 0;
+  });
+  var bookingsByProductUid = indexBookingsByProductUid(childBookings);
   var linesByUid = indexProductsByUid(productLines);
   var addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  var claimedUids = new Set();
   var claimedAddTimeLines = new Set();
-  var cartBookings = bookingList.filter(function (booking) {
-    return booking.parent_id !== 0;
-  }).reduce(function (acc, booking) {
-    var uid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
+  childBookings.forEach(function (booking) {
     var bookingUid = getBookingUid(booking);
-    var product = null;
-    if (uid !== undefined && uid !== null && uid !== '') {
-      var key = String(uid);
-      if (!claimedUids.has(key)) {
-        var line = linesByUid[key];
-        // 赠品预约只作为提交数据保留，不在购物车顶部预约卡片区展示。
-        if (isGiftProductLine(line)) return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
-    var addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach(function (line) {
-      return claimedAddTimeLines.add(line);
+    if (!bookingUid) return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach(function (line) {
+      claimedAddTimeLines.add(line);
     });
-    acc.push(_objectSpread(_objectSpread({}, booking), {}, {
+  });
+  var claimedBookings = new Set();
+  var cartBookings = [];
+  var items = [];
+  var orderedLines = [];
+  var buildBookingView = function buildBookingView(booking, product) {
+    var bookingUid = getBookingUid(booking);
+    var addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
+    return _objectSpread(_objectSpread({}, booking), {}, {
       _extend: {
         product: product,
         addTimeProduct: addTimeProduct,
@@ -147,21 +142,38 @@ export function buildCartView(lines, bookings) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    }));
-    return acc;
-  }, []);
-  var items = productLines.filter(function (line) {
+    });
+  };
+  productLines.forEach(function (line) {
     var _line$metadata6;
-    // 促销赠品行仅通过主商品 Gift 行展示，不在 items 单独占一行（对齐 legacy `isGift: !!_giftInfo`）
-    if (isGiftProductLine(line)) return false;
-    if (claimedAddTimeLines.has(line)) return false;
+    // 赠品由主商品 Gift 行展示；加时商品挂在 booking._extend.addTimeProduct。
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line)) return;
     var uid = (_line$metadata6 = line.metadata) === null || _line$metadata6 === void 0 ? void 0 : _line$metadata6.unique_identification_number;
-    if (uid === undefined || uid === null || uid === '') return true;
-    return !claimedUids.has(String(uid));
+    var matchedBooking = uid === undefined || uid === null || uid === '' ? undefined : (bookingsByProductUid[String(uid)] || []).find(function (booking) {
+      return !claimedBookings.has(booking);
+    });
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      var bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach(function (booking) {
+    if (claimedBookings.has(booking)) return;
+    var uid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
+    var linkedProduct = uid === undefined || uid === null || uid === '' ? null : linesByUid[String(uid)] || null;
+    // 赠品预约只作为提交数据保留，不在购物车预约卡片区展示。
+    if (isGiftProductLine(linkedProduct)) return;
+    cartBookings.push(buildBookingView(booking, null));
   });
   return {
     bookings: cartBookings,
-    items: items
+    items: items,
+    lines: orderedLines
   };
 }
 export function isWalkInCustomer(customer) {

package/dist/solution/Sales/index.d.ts

@@ -95,6 +95,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/dist/solution/Sales/index.js

@@ -485,11 +485,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
      */
   }, {
     key: "pickBookingsForCurrentPoint",
     value: function pickBookingsForCurrentPoint(current, bookings) {
       var _this4 = this;
+      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (bookings.length === 0) return [];
       var currentDayStart = current.startOf('day');
       var currentDayEnd = current.endOf('day');
@@ -504,6 +506,13 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       if (dayScopedBookings.length === 0) return [];
       var appendNextStartGroupIfNeeded = function appendNextStartGroupIfNeeded(selectedBookings) {
         if (selectedBookings.length === 0) return selectedBookings;
+        if (options.includeAllFuture) {
+          var allFutureBookings = dayScopedBookings.filter(function (booking) {
+            var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
+            return startAt.isValid() && startAt.isAfter(current);
+          });
+          return [].concat(_toConsumableArray(selectedBookings), _toConsumableArray(allFutureBookings));
+        }
         var shouldAppendNextGroup = selectedBookings.some(function (booking) {
           return booking.status === 'reserved' || booking.status === 'occupied';
         });
@@ -554,6 +563,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
         return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, 'day');
       });
       if (upcoming.length > 0) {
+        if (options.includeAllFuture) return upcoming;
         var firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
         var upcomingStartGroup = upcoming.filter(function (booking) {
           var startAt = _this4.toBookingDateTime(booking.start_date, booking.start_time);
@@ -907,7 +917,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               unpaidBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.isUnpaidBooking(booking);
               });
-              bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
+              bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
+                includeAllFuture: true
+              });
               completedBookings = completedBookingList.map(function (booking) {
                 return _objectSpread(_objectSpread({}, booking), {}, {
                   status: 'compelete',
@@ -919,7 +931,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                   remainingReserveTime: undefined
                 });
               });
-              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
+              unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList), {
+                includeAllFuture: true
+              });
               orderCount = this.countBookingOrders(statsBookingList);
               bookingCount = statsBookingList.length;
               compeleteBookingCount = this.countCompletedBookings(statsBookingList);

package/dist/solution/UnifiedBookingSales/index.d.ts

@@ -102,10 +102,6 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
      * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.
      */
-    getCart(): {
-        items: any[];
-        bookings: any[];
-    };
     /**
      * Loads the current customer's product coupons and discount cards after planner lines exist,
      * then optionally lets the existing Rules engine select the best valid combination. This is a

package/dist/solution/UnifiedBookingSales/index.js

@@ -880,32 +880,33 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
      * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
      * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.
      */
-  }, {
-    key: "getCart",
-    value: function getCart() {
-      var tempOrder = this.getTempOrder();
-      var salesDetail = this.getSalesOrder();
-      var items = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products) || [];
-      var bookings = (salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) || (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.bookings) || [];
-      return {
-        items: items,
-        bookings: bookings.map(function (booking) {
-          var productUid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
-          var product = productUid ? items.find(function (item) {
-            var _item$metadata;
-            var uid = (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.unique_identification_number) || (item === null || item === void 0 ? void 0 : item.unique_identification_number);
-            return String(uid || '') === String(productUid);
-          }) || null : null;
-          return _objectSpread(_objectSpread({}, booking), {}, {
-            _extend: _objectSpread(_objectSpread({}, (booking === null || booking === void 0 ? void 0 : booking._extend) || {}), {}, {
-              product: product,
-              addTimeProduct: [],
-              canAddTime: false
-            })
-          });
-        })
-      };
-    }
+    // getCart(): BookingTicketCartView {
+    //   const tempOrder = this.getTempOrder();
+    //   const salesDetail = this.getSalesOrder();
+    //   const items = tempOrder?.products || [];
+    //   const bookings = salesDetail?.bookings || tempOrder?.bookings || [];
+    //   return {
+    //     items,
+    //     bookings: bookings.map((booking: any) => {
+    //       const productUid = booking?.product_uid;
+    //       const product = productUid
+    //         ? items.find((item: any) => {
+    //           const uid = item?.metadata?.unique_identification_number || item?.unique_identification_number;
+    //           return String(uid || '') === String(productUid);
+    //         }) || null
+    //         : null;
+    //       return {
+    //         ...booking,
+    //         _extend: {
+    //           ...(booking?._extend || {}),
+    //           product,
+    //           addTimeProduct: [],
+    //           canAddTime: false,
+    //         },
+    //       };
+    //     }),
+    //   };
+    // }
 
     /**
      * Loads the current customer's product coupons and discount cards after planner lines exist,

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,51 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -149,7 +149,9 @@ function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map((item) => {
     return {
       ...item,
-      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+      // 后端历史订单可能没有 original_price；此时 price 是折前毛价，
+      // bundle_selling_price 已包含折扣，不能把它当成编辑时的新原价。
+      original_price: item.original_price ?? item.product_price ?? item.price ?? item.bundle_selling_price
     };
   });
 }

package/lib/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/lib/modules/Order/index.js

@@ -2897,8 +2897,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await this.appendProductLineToTempOrder(tempOrder, { product_id: 1, num: 1 }, booking);
    */
-  async appendProductLineToTempOrder(tempOrder, product, booking) {
-    var _a, _b;
+  async appendProductLineToTempOrder(tempOrder, product, booking, options) {
+    var _a, _b, _c, _d;
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
     const incomingFingerprint = (0, import_utils3.buildProductLineFingerprint)(
@@ -2909,7 +2909,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       productToAdd,
       (0, import_utils3.normalizeOrderProduct)(productToAdd)
     );
-    const incomingBookingUid = productToAdd.booking_uid ?? ((_a = productToAdd.metadata) == null ? void 0 : _a.booking_uid);
+    const isWeighingProduct = Number(((_a = normalizedIncoming.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1;
+    const netWeight = Number((_b = normalizedIncoming.product_sku) == null ? void 0 : _b.net_weight);
+    if (isWeighingProduct && (!Number.isFinite(netWeight) || netWeight <= 0)) {
+      throw new Error("[Order] 称重商品净重必须大于 0");
+    }
+    const incomingBookingUid = productToAdd.booking_uid ?? ((_c = productToAdd.metadata) == null ? void 0 : _c.booking_uid);
     if (incomingBookingUid !== void 0 && incomingBookingUid !== null && String(incomingBookingUid) !== "") {
       normalizedIncoming.booking_uid = String(incomingBookingUid);
       normalizedIncoming.metadata = {
@@ -2925,7 +2930,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
-    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid;
+    const shouldForceNewLine = !!booking || hasIncomingProductNote || hasIncomingBookingUid || isWeighingProduct;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       var _a2;
       if (this.hasGoodPassDiscount(item))
@@ -2974,10 +2979,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           booking_uid: linked.bookingUid
         };
       }
-      tempOrder.products = [...tempOrder.products, normalizedIncoming];
+      const insertAtIndex = options == null ? void 0 : options.insertAtIndex;
+      if (Number.isInteger(insertAtIndex) && Number(insertAtIndex) >= 0 && Number(insertAtIndex) < tempOrder.products.length) {
+        tempOrder.products = [
+          ...tempOrder.products.slice(0, insertAtIndex),
+          normalizedIncoming,
+          ...tempOrder.products.slice(insertAtIndex)
+        ];
+      } else {
+        tempOrder.products = [...tempOrder.products, normalizedIncoming];
+      }
     } else {
       const targetProduct = matchedProduct;
-      const targetUid = (_b = targetProduct.metadata) == null ? void 0 : _b.unique_identification_number;
+      const targetUid = (_d = targetProduct.metadata) == null ? void 0 : _d.unique_identification_number;
       const normalizedProduct = (0, import_utils.mergeOrderProductDisplayFields)(
         targetProduct,
         (0, import_utils3.normalizeOrderProduct)({
@@ -3033,6 +3047,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         tempOrder.products[matchedIndex],
         targetUid
       );
+      if (matchedIndex !== tempOrder.products.length - 1) {
+        const mergedProduct = tempOrder.products[matchedIndex];
+        tempOrder.products = [
+          ...tempOrder.products.slice(0, matchedIndex),
+          ...tempOrder.products.slice(matchedIndex + 1),
+          mergedProduct
+        ];
+      }
     }
     if (linked) {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
@@ -3045,8 +3067,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * await order.addProductToOrder({ product_id: 1, num: 3 }, { start_time: '10:00' });
    * // → tempOrder.products 新增 3 行，每行 num=1，bookings 3 条
    */
-  async addProductToOrder(product, booking) {
+  async addProductToOrder(product, booking, options) {
     const tempOrder = this.ensureTempOrder();
+    const insertAfterProductUid = options == null ? void 0 : options.insertAfterProductUid;
+    const anchorIndex = booking && insertAfterProductUid ? tempOrder.products.findIndex((line) => {
+      var _a;
+      const uid = ((_a = line.metadata) == null ? void 0 : _a.unique_identification_number) || line.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(insertAfterProductUid);
+    }) : -1;
+    let insertAtIndex = anchorIndex >= 0 ? anchorIndex + 1 : void 0;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -3060,14 +3089,22 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           await this.appendProductLineToTempOrder(
             tempOrder,
             singleLine,
-            (0, import_lodash_es.cloneDeep)(booking)
+            (0, import_lodash_es.cloneDeep)(booking),
+            { insertAtIndex }
           );
+          if (insertAtIndex !== void 0)
+            insertAtIndex += 1;
         }
         await this.finalizeProductOrderMutation(tempOrder);
         return tempOrder.products;
       }
     }
-    await this.appendProductLineToTempOrder(tempOrder, product, booking);
+    await this.appendProductLineToTempOrder(
+      tempOrder,
+      product,
+      booking,
+      { insertAtIndex }
+    );
     await this.finalizeProductOrderMutation(tempOrder);
     this.logInfo("addProductToOrder success", {
       product_id: product.product_id,
@@ -3548,7 +3585,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @example
    * await order.removeProductsFromOrder([identityA, identityB]);
    */
-  async removeProductsFromOrder(identities) {
+  async removeProductsFromOrder(identities, options) {
     var _a, _b, _c, _d;
     const tempOrder = this.ensureTempOrder();
     if (!identities.length) {
@@ -3556,6 +3593,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const productsBeforeRemove = tempOrder.products || [];
     const bookingsBeforeRemove = tempOrder.bookings || [];
+    const preserveDisplayPosition = options == null ? void 0 : options.preserveDisplayPosition;
+    const anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex((item) => {
+      var _a2;
+      const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+      return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
+    }) : -1;
+    const productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
     const matchedProducts = productsBeforeRemove.filter((item) => {
       return identities.some((identity) => (0, import_utils3.isIdentityMatch)(item, identity));
     });
@@ -3596,14 +3640,37 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return !(isAddTimeProduct && lineBookingUid !== void 0 && lineBookingUid !== null && linkedBookingUidsToRemove.has(String(lineBookingUid)));
       });
     }
+    if (preserveDisplayPosition && anchorIndex >= 0) {
+      const remainingProductIndex = tempOrder.products.findIndex((item) => {
+        var _a2;
+        const uid = ((_a2 = item.metadata) == null ? void 0 : _a2.unique_identification_number) || item.unique_identification_number;
+        return uid !== void 0 && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
+      });
+      if (remainingProductIndex >= 0) {
+        const remainingProduct = tempOrder.products[remainingProductIndex];
+        const nextProduct = productsAfterAnchor.find(
+          (item) => tempOrder.products.includes(item)
+        );
+        const productsWithoutRemaining = [
+          ...tempOrder.products.slice(0, remainingProductIndex),
+          ...tempOrder.products.slice(remainingProductIndex + 1)
+        ];
+        const nextProductIndex = nextProduct ? productsWithoutRemaining.indexOf(nextProduct) : -1;
+        tempOrder.products = nextProductIndex >= 0 ? [
+          ...productsWithoutRemaining.slice(0, nextProductIndex),
+          remainingProduct,
+          ...productsWithoutRemaining.slice(nextProductIndex)
+        ] : [...productsWithoutRemaining, remainingProduct];
+      }
+    }
     await this.finalizeAfterProductsMutation(tempOrder);
     this.logInfo("removeProductsFromOrder success", {
       identities
     });
     return tempOrder.products;
   }
-  async removeProductFromOrder(identity) {
-    return this.removeProductsFromOrder([identity]);
+  async removeProductFromOrder(identity, options) {
+    return this.removeProductsFromOrder([identity], options);
   }
   /**
    * 仅清空购物车行（products / bookings），不重置整单。

package/lib/modules/Order/types.d.ts

@@ -321,6 +321,24 @@ export interface ReplaceTempOrderOptions {
     saveDraft?: boolean;
 }
 export type AddProductBookingInput = Record<string, any>;
+/**
+ * 添加商品行时的顺序控制。
+ * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，
+ * 避免步进器修改数量改变该组展示位置。
+ */
+export interface AddProductToOrderOptions {
+    insertAfterProductUid?: string;
+}
+/**
+ * 删除商品后的可选位置保持策略。
+ * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
+ */
+export interface RemoveProductsFromOrderOptions {
+    preserveDisplayPosition?: {
+        remainingProductUid: string;
+        anchorProductUid: string;
+    };
+}
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 export interface UpdateOrderProductParams {
     product_id: number | null;
@@ -722,15 +740,15 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
-    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
+    addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
     updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
-    removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */
-    removeProductsFromOrder: (identities: OrderProductIdentity[]) => Promise<OrderProduct[]>;
+    removeProductsFromOrder: (identities: OrderProductIdentity[], options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** @deprecated no-op；OrderModule 不再负责 tempOrder localStorage 持久化。 */
     persistTempOrder: () => void;
     /**

package/lib/modules/ProductList/index.js

@@ -126,7 +126,15 @@ var ProductList = class extends import_BaseModule.BaseModule {
         "ticket",
         "event_item"
       ],
-      with: ["category", "collection", "resourceRelation"],
+      with: [
+        "category",
+        "collection",
+        "resourceRelation",
+        "bundleGroup.bundleItem",
+        "optionGroup.optionItem",
+        "variantGroup.variantItem",
+        "dataVariants"
+      ],
       status,
       num: 500,
       skip: 1,