@pisell/pisellos 0.10.7 → 0.10.9

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/addProductDecision.js

@@ -318,7 +318,7 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
+  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2, _cacheItem$metadata$s, _cacheItem$metadata, _extend$metadata;
   var other = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.other) || {};
   var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
@@ -347,6 +347,7 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
     discount_reason: extend === null || extend === void 0 ? void 0 : extend.discount_reason,
     discount_list: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list,
+    selected_settlement_snapshot: (_cacheItem$metadata$s = cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata = cacheItem.metadata) === null || _cacheItem$metadata === void 0 ? void 0 : _cacheItem$metadata.selected_settlement_snapshot) !== null && _cacheItem$metadata$s !== void 0 ? _cacheItem$metadata$s : extend === null || extend === void 0 || (_extend$metadata = extend.metadata) === null || _extend$metadata === void 0 ? void 0 : _extend$metadata.selected_settlement_snapshot,
     _extend: extend
   };
 }

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/index.js

@@ -2757,10 +2757,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           ruleProductsForResource,
           occupancyMinutes,
           paxBounds,
-          error,
-          _occupancyMinutes,
-          _paxBounds,
-          _error,
           occupyDetails,
           occupyDetail,
           resourceSelectType,
@@ -2903,59 +2899,24 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               });
             case 46:
               loaded = _context37.sent;
-              if (Array.isArray(loaded)) {
-                matchedRuleProduct = findReservationRuleProductByResourceId(loaded, normalizedResourceId);
-                ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
-                this.enabledReservationRuleProducts = ruleProductsForResource;
-                occupancyMinutes = pickFirstDurationMinutesFromProducts(ruleProductsForResource);
-                if (occupancyMinutes !== undefined) {
-                  tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-                }
-                if (hasCustomCapacityProduct(ruleProductsForResource)) {
-                  pendingRequestEntryPax = 1;
-                  paxBounds = pickFirstCustomCapacityPaxBounds(ruleProductsForResource);
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) pendingRequestPaxMin = paxBounds.min;
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) pendingRequestPaxMax = paxBounds.max;
-                }
-              } else {
-                this.enabledReservationRuleProducts = [];
-                error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
-                this.logMethodError('loadReservationRuleProducts', error, {
-                  resourceId: normalizedResourceId,
-                  reservationLinkIds: reservationLinkIds,
-                  scheduleDate: scheduleDate,
-                  scheduleDatetime: scheduleDatetime,
-                  cacheId: this.cacheId
-                });
-                if (Array.isArray(loaded)) {
-                  this.enabledReservationRuleProducts = loaded;
-                  _occupancyMinutes = pickFirstDurationMinutesFromProducts(loaded);
-                  if (_occupancyMinutes !== undefined) {
-                    tempOrder.metadata.table_occupancy_duration = _occupancyMinutes;
-                  }
-                  if (hasCustomCapacityProduct(loaded)) {
-                    pendingRequestEntryPax = 1;
-                    _paxBounds = pickFirstCustomCapacityPaxBounds(loaded);
-                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.min) !== undefined) pendingRequestPaxMin = _paxBounds.min;
-                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.max) !== undefined) pendingRequestPaxMax = _paxBounds.max;
-                  }
-                } else {
-                  this.enabledReservationRuleProducts = [];
-                  _error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
-                  this.logMethodError('loadReservationRuleProducts', _error, {
-                    resourceId: resourceId,
-                    reservationLinkIds: reservationLinkIds,
-                    scheduleDate: scheduleDate,
-                    scheduleDatetime: scheduleDatetime,
-                    cacheId: this.cacheId
-                  });
-                }
+              matchedRuleProduct = findReservationRuleProductByResourceId(loaded, normalizedResourceId);
+              ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+              this.enabledReservationRuleProducts = ruleProductsForResource;
+              occupancyMinutes = pickFirstDurationMinutesFromProducts(ruleProductsForResource);
+              if (occupancyMinutes !== undefined) {
+                tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+              }
+              if (hasCustomCapacityProduct(ruleProductsForResource)) {
+                pendingRequestEntryPax = 1;
+                paxBounds = pickFirstCustomCapacityPaxBounds(ruleProductsForResource);
+                if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) pendingRequestPaxMin = paxBounds.min;
+                if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) pendingRequestPaxMax = paxBounds.max;
               }
 
               // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
-              _context37.next = 50;
+              _context37.next = 55;
               return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
-            case 50:
+            case 55:
               occupyDetails = _context37.sent;
               occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null; // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
@@ -2963,7 +2924,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               allowAddItems = toBoolean(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['sale.allow_add_items']);
               additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(additionalOrderResult.reason === 'multiple_orders')) {
-                _context37.next = 61;
+                _context37.next = 66;
                 break;
               }
               multipleOrdersState = _objectSpread(_objectSpread({}, this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId)), {}, {
@@ -2984,7 +2945,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 resourceSelectType: resourceSelectType
               });
               return _context37.abrupt("return", _availabilityInfo);
-            case 61:
+            case 66:
               // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
               resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
               additionalOrderId = additionalOrderResult.order_id;
@@ -3030,12 +2991,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 73;
+                _context37.next = 78;
                 break;
               }
-              _context37.next = 73;
+              _context37.next = 78;
               return this.addNewOrder();
-            case 73:
+            case 78:
               isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
               if (isAdditionalOrderMode) {
                 tempOrder.order_id = additionalOrderId;
@@ -3051,13 +3012,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 79;
+              _context37.next = 84;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 79:
+            case 84:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -3079,18 +3040,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 84:
-              _context37.prev = 84;
+            case 89:
+              _context37.prev = 89;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 88:
+            case 93:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 84]]);
+        }, _callee37, this, [[3, 89]]);
       }));
       function checkResourceAvailable(_x20) {
         return _checkResourceAvailable.apply(this, arguments);

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

@@ -76,6 +76,11 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
      */
     setSessionStateValue(key: string, value: unknown): void;
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+    clearSessionStorageOrderSnapshot(): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -122,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

package/dist/solution/UnifiedBookingSales/index.js

@@ -584,6 +584,17 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
       });
     }
 
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+  }, {
+    key: "clearSessionStorageOrderSnapshot",
+    value: function clearSessionStorageOrderSnapshot() {
+      var _this$store$order, _this$store$order$cle;
+      (_this$store$order = this.store.order) === null || _this$store$order === void 0 || (_this$store$order$cle = _this$store$order.clearSessionStoragePersistedTempOrder) === null || _this$store$order$cle === void 0 || _this$store$order$cle.call(_this$store$order);
+    }
+
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -622,12 +633,12 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "addNewOrder",
     value: function () {
       var _addNewOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this$store$order, _this$store$order$con, _this$store$order3;
-        var sessionRecord, tempOrder, _this$store$order2, didSyncAuthenticatedCustomer;
+        var _this$store$order2, _this$store$order2$co, _this$store$order4;
+        var sessionRecord, tempOrder, _this$store$order3, didSyncAuthenticatedCustomer;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              sessionRecord = this.isSessionStoragePersistEnabled() ? (_this$store$order = this.store.order) === null || _this$store$order === void 0 || (_this$store$order$con = _this$store$order.consumeSessionStorageRestore) === null || _this$store$order$con === void 0 ? void 0 : _this$store$order$con.call(_this$store$order) : null;
+              sessionRecord = this.isSessionStoragePersistEnabled() ? (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || (_this$store$order2$co = _this$store$order2.consumeSessionStorageRestore) === null || _this$store$order2$co === void 0 ? void 0 : _this$store$order2$co.call(_this$store$order2) : null;
               if (!sessionRecord) {
                 _context.next = 4;
                 break;
@@ -643,7 +654,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
             case 6:
               tempOrder = _context.sent;
               if (sessionRecord) {
-                (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || _this$store$order2.persistTempOrder();
+                (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || _this$store$order3.persistTempOrder();
               }
               if (!this.isAuthenticatedCustomerUserPlatform()) {
                 _context.next = 23;
@@ -686,7 +697,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               _context.t1 = _context["catch"](24);
               console.warn('[UnifiedBookingSales] Failed to refresh cached customer discounts after addNewOrder', _context.t1);
             case 32:
-              return _context.abrupt("return", ((_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 ? void 0 : _this$store$order3.getTempOrder()) || tempOrder);
+              return _context.abrupt("return", ((_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getTempOrder()) || tempOrder);
             case 33:
             case "end":
               return _context.stop();
@@ -757,8 +768,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "resolveDiscountOrderIdentity",
     value: function resolveDiscountOrderIdentity(tempOrder) {
-      var _this$store$order4, _this$store$order4$ge;
-      return (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || ((_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || (_this$store$order4$ge = _this$store$order4.getOrderIdentity) === null || _this$store$order4$ge === void 0 || (_this$store$order4$ge = _this$store$order4$ge.call(_this$store$order4)) === null || _this$store$order4$ge === void 0 ? void 0 : _this$store$order4$ge.orderId) || null;
+      var _this$store$order5, _this$store$order5$ge;
+      return (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || ((_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getOrderIdentity) === null || _this$store$order5$ge === void 0 || (_this$store$order5$ge = _this$store$order5$ge.call(_this$store$order5)) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.orderId) || null;
     }
   }, {
     key: "resolveDiscountAction",
@@ -770,16 +781,16 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "resetCachedCustomerDiscountState",
     value: function () {
       var _resetCachedCustomerDiscountState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$store$order5, _this$store$order5$cl, _this$store$customer2, _this$store$customer3, _this$store$order6, _discountModule$getOr, _discountModule$getDi, _discountModule$setOr, _discountModule$setDi, _this$store$order7, _this$store$order7$ap, _this$store$order8, _this$store$order8$re, _this$store$order9, _this$store$order9$pe;
+        var _this$store$order6, _this$store$order6$cl, _this$store$customer2, _this$store$customer3, _this$store$order7, _discountModule$getOr, _discountModule$getDi, _discountModule$setOr, _discountModule$setDi, _this$store$order8, _this$store$order8$ap, _this$store$order9, _this$store$order9$re, _this$store$order10, _this$store$order10$p;
         var orderStore, discountModule, filteredOriginalDiscounts, filteredCurrentDiscounts;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$cl = _this$store$order5.clearOrderCustomer) === null || _this$store$order5$cl === void 0 || _this$store$order5$cl.call(_this$store$order5);
+              (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$cl = _this$store$order6.clearOrderCustomer) === null || _this$store$order6$cl === void 0 || _this$store$order6$cl.call(_this$store$order6);
               (_this$store$customer2 = this.store.customer) === null || _this$store$customer2 === void 0 || (_this$store$customer3 = _this$store$customer2.setSelectedCustomer) === null || _this$store$customer3 === void 0 || _this$store$customer3.call(_this$store$customer2, null);
               this.discountConfigCacheKey = null;
               this.hasManualDiscountSelection = false;
-              orderStore = ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.store) || {};
+              orderStore = ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.store) || {};
               discountModule = orderStore.discount;
               filteredOriginalDiscounts = filterCustomerBoundDiscounts((discountModule === null || discountModule === void 0 || (_discountModule$getOr = discountModule.getOriginalDiscountList) === null || _discountModule$getOr === void 0 ? void 0 : _discountModule$getOr.call(discountModule)) || []);
               filteredCurrentDiscounts = filterCustomerBoundDiscounts((discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || []);
@@ -789,13 +800,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               _context3.next = 12;
               return discountModule === null || discountModule === void 0 || (_discountModule$setDi = discountModule.setDiscountList) === null || _discountModule$setDi === void 0 ? void 0 : _discountModule$setDi.call(discountModule, filteredCurrentDiscounts);
             case 12:
-              (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ap = _this$store$order7.applyDiscount) === null || _this$store$order7$ap === void 0 || _this$store$order7$ap.call(_this$store$order7);
+              (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || (_this$store$order8$ap = _this$store$order8.applyDiscount) === null || _this$store$order8$ap === void 0 || _this$store$order8$ap.call(_this$store$order8);
               _context3.next = 15;
-              return (_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 || (_this$store$order8$re = _this$store$order8.recalculateSummary) === null || _this$store$order8$re === void 0 ? void 0 : _this$store$order8$re.call(_this$store$order8, {
+              return (_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 || (_this$store$order9$re = _this$store$order9.recalculateSummary) === null || _this$store$order9$re === void 0 ? void 0 : _this$store$order9$re.call(_this$store$order9, {
                 createIfMissing: true
               });
             case 15:
-              (_this$store$order9 = this.store.order) === null || _this$store$order9 === void 0 || (_this$store$order9$pe = _this$store$order9.persistTempOrder) === null || _this$store$order9$pe === void 0 || _this$store$order9$pe.call(_this$store$order9);
+              (_this$store$order10 = this.store.order) === null || _this$store$order10 === void 0 || (_this$store$order10$p = _this$store$order10.persistTempOrder) === null || _this$store$order10$p === void 0 || _this$store$order10$p.call(_this$store$order10);
             case 16:
             case "end":
               return _context3.stop();
@@ -1188,32 +1199,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/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {