@pisell/pisellos 0.10.6 → 0.10.8

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

@@ -466,13 +466,36 @@ function getProductLineNoteSignature(product) {
   var uid = getOrderProductUid(product);
   return uid ? "note:".concat(uid) : "note:".concat(normalizedNote);
 }
+function hasGoodPassDiscount(product) {
+  var _product$_extend;
+  var productBundle = Array.isArray(product === null || product === void 0 ? void 0 : product.product_bundle) ? product.product_bundle : [];
+  var extendedBundle = Array.isArray(product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 || (_product$_extend = _product$_extend.other) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle) ? product._extend.other.bundle : [];
+  var discountLists = [product === null || product === void 0 ? void 0 : product.discount_list].concat(_toConsumableArray(productBundle.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.discount_list;
+  })), _toConsumableArray(extendedBundle.map(function (item) {
+    return item === null || item === void 0 ? void 0 : item.discount_list;
+  })));
+  return discountLists.some(function (discountList) {
+    return Array.isArray(discountList) && discountList.some(function (item) {
+      return (item === null || item === void 0 ? void 0 : item.type) === 'good_pass' || (item === null || item === void 0 ? void 0 : item.tag) === 'good_pass';
+    });
+  });
+}
 
 /**
- * 编辑订单时，历史行仍参与整车促销评估，但不能与本次新增行合并。
- * 以历史行 uid 作为促销前后的行边界；新增行返回空边界，仍保留原有合并语义。
+ * 商品券、自定义商品、称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$metadata3;
+  var _product$product_sku, _product$metadata3;
+  if ((product === null || product === void 0 ? void 0 : product.product_id) === undefined || (product === null || product === void 0 ? void 0 : product.product_id) === null) {
+    return "custom:".concat(getOrderProductUid(product));
+  }
+  if (hasGoodPassDiscount(product)) {
+    return "good-pass:".concat(getOrderProductUid(product));
+  }
+  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/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -193,7 +193,7 @@ export function transformBaseProductToOrderProduct(params) {
   }
   // 从源头补充商品多语言标题
   var productTitle = _objectSpread(_objectSpread({}, (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title_i18n) || {}), {}, {
-    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
+    original: (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.original_title) || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || ''
   });
   return {
     product_id: productId,

package/dist/solution/BaseSales/utils.js

@@ -37,35 +37,46 @@ export function createEmptySummary() {
  * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
  */
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
-  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
-    return {
-      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
-    };
-  }).sort(function (p, q) {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num) return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  var normalizeOptions = function normalizeOptions(options) {
+    var optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map(function (item) {
+      var _ref, _item$add_price;
+      return {
+        option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
+        option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+        num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+        price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      };
+    }).sort(function (p, q) {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num) return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  var normalizedOpts = normalizeOptions(productOptionItem);
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref2, _item$bundle_id, _item$bundle_variant_;
     return {
       bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+      product_variant_id: Number((_item$bundle_variant_ = item === null || item === void 0 ? void 0 : item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item === null || item === void 0 ? void 0 : item.product_variant_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      option: normalizeOptions(item === null || item === void 0 ? void 0 : item.option)
     };
   }).sort(function (p, q) {
     if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id) return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num) return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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 | 2 | 1 | 6 | 4 | 3 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -447,7 +447,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -402,35 +402,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function () {
       var _configureIdGeneratorFromOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _openDataConfig, _openDataConfig2, _openDataConfig3, _openDataConfig4, _openDataConfig5, _openDataConfig6;
-        var openDataConfig, idGenerator, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
+        var idGenerator, openDataConfig, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               // 业务码切换或配置失败时不能复用上一次初始化的短号。
               this.setPaymentNumberDevicePrefix(null);
-              openDataConfig = null;
-              _context5.prev = 2;
-              _context5.next = 5;
-              return this.loadOpenDataConfig();
-            case 5:
-              openDataConfig = _context5.sent;
-              _context5.next = 12;
-              break;
-            case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](2);
-              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
-              return _context5.abrupt("return");
-            case 12:
-              // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 16;
+                _context5.next = 5;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
+            case 5:
+              openDataConfig = null;
+              _context5.prev = 6;
+              _context5.next = 9;
+              return this.loadOpenDataConfig();
+            case 9:
+              openDataConfig = _context5.sent;
+              _context5.next = 16;
+              break;
+            case 12:
+              _context5.prev = 12;
+              _context5.t0 = _context5["catch"](6);
+              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
+              return _context5.abrupt("return");
             case 16:
+              // if (!openDataConfig) return;
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
@@ -477,7 +477,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 8], [30, 35]]);
+        }, _callee5, this, [[6, 12], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -2644,10 +2644,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context30.next = 11;
                 break;
               }
-              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines, {
-                skipEditDiscountConfigRefresh: true,
-                skipDiscountRecalculation: true
-              }));
+              return _context30.abrupt("return", this.store.order.addProductsToOrder(orderLines));
             case 11:
               result = [];
               _iterator2 = _createForOfIteratorHelper(orderLines);

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/ScanOrder/utils.js

@@ -388,35 +388,46 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
  * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
  */
 export function buildProductLineFingerprint(productOptionItem, productBundle) {
-  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  var normalizedOpts = optArr.map(function (item) {
-    var _ref, _item$add_price;
-    return {
-      option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
-      option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-      price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
-    };
-  }).sort(function (p, q) {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id) return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num) return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  var normalizeOptions = function normalizeOptions(options) {
+    var optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map(function (item) {
+      var _ref, _item$add_price;
+      return {
+        option_group_item_id: Number(item === null || item === void 0 ? void 0 : item.option_group_item_id) || 0,
+        option_group_id: Number(item === null || item === void 0 ? void 0 : item.option_group_id) || 0,
+        num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+        price: String((_ref = (_item$add_price = item === null || item === void 0 ? void 0 : item.add_price) !== null && _item$add_price !== void 0 ? _item$add_price : item === null || item === void 0 ? void 0 : item.price) !== null && _ref !== void 0 ? _ref : '')
+      };
+    }).sort(function (p, q) {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num) return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  var normalizedOpts = normalizeOptions(productOptionItem);
   var bundleArr = Array.isArray(productBundle) ? productBundle : [];
   var normalizedBundles = bundleArr.map(function (item) {
-    var _ref2, _item$bundle_id;
+    var _ref2, _item$bundle_id, _item$bundle_variant_;
     return {
       bundle_id: Number((_ref2 = (_item$bundle_id = item === null || item === void 0 ? void 0 : item.bundle_id) !== null && _item$bundle_id !== void 0 ? _item$bundle_id : item === null || item === void 0 ? void 0 : item.id) !== null && _ref2 !== void 0 ? _ref2 : 0) || 0,
       product_id: Number(item === null || item === void 0 ? void 0 : item.product_id) || 0,
-      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+      product_variant_id: Number((_item$bundle_variant_ = item === null || item === void 0 ? void 0 : item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item === null || item === void 0 ? void 0 : item.product_variant_id) || 0,
+      num: typeof (item === null || item === void 0 ? void 0 : item.num) === 'number' && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+      option: normalizeOptions(item === null || item === void 0 ? void 0 : item.option)
     };
   }).sort(function (p, q) {
     if (p.bundle_id !== q.bundle_id) return p.bundle_id - q.bundle_id;
     if (p.product_id !== q.product_id) return p.product_id - q.product_id;
-    return p.num - q.num;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num) return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -63,8 +63,24 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private openDataTarget;
     private loadOpenDataInFlight;
     private loadOpenDataInFlightTarget;
+    protected getSubmitOrderSalesChannel(): string;
     protected isSessionStoragePersistEnabled(): boolean;
     protected shouldUseSessionStorageForSubModule(moduleName?: string): boolean;
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+    getSessionStateValue<T = unknown>(key: string): T | undefined;
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+    setSessionStateValue(key: string, value: unknown): void;
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+    clearSessionStorageOrderSnapshot(): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -111,10 +127,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