@pisell/pisellos 2.3.66 → 2.3.68

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -284,7 +285,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -328,7 +330,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -52,6 +52,7 @@ import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resol
 import { createUuidV4 } from "../../modules/Order/utils";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
+var USER_PLATFORM = ['pc', 'h5'];
 
 /**
  * 读取已有 booking 的协议唯一值，用于加时商品行绑定原预约。
@@ -178,6 +179,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "addTimeProductsCatalog", []);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshCustomerId", null);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerPromotionRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataConfigInFlight", null);
     return _this;
   }
@@ -400,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'], '');
@@ -475,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);
@@ -559,7 +561,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw, scannedList, extractedCustomerId, hasOrderCustomer, tempOrder;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer, isUserPlatform, tempOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -575,33 +577,34 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               raw = _context7.sent;
               scannedList = raw.scannedDiscountList || [];
               extractedCustomerId = this.getDiscountCustomerId(scannedList);
-              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer()); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
-              if (!(!hasOrderCustomer && extractedCustomerId)) {
-                _context7.next = 11;
+              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
+              isUserPlatform = USER_PLATFORM.includes(this.otherParams.platform); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
+              if (!(!hasOrderCustomer && extractedCustomerId && !isUserPlatform)) {
+                _context7.next = 12;
                 break;
               }
-              _context7.next = 11;
+              _context7.next = 12;
               return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
-            case 11:
+            case 12:
               if (!raw.isAvailable) {
-                _context7.next = 18;
+                _context7.next = 19;
                 break;
               }
-              _context7.next = 14;
+              _context7.next = 15;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 14:
+            case 15:
               this.store.order.persistTempOrder();
               tempOrder = this.store.order.ensureTempOrder();
-              _context7.next = 18;
+              _context7.next = 19;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: this.store.order.getDiscountList(),
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 18:
+            case 19:
               return _context7.abrupt("return", _objectSpread(_objectSpread({
                 isAvailable: raw.isAvailable
               }, raw.isAccepted !== undefined ? {
@@ -611,7 +614,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
               }));
-            case 19:
+            case 20:
             case "end":
               return _context7.stop();
           }
@@ -1556,7 +1559,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "setOrderCustomer",
     value: function setOrderCustomer(customer) {
-      var _this$store$order$get3;
+      var _this$store$order$get3,
+        _this3 = this;
       if (!customer) {
         this.clearOrderCustomer();
         return;
@@ -1585,8 +1589,17 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
-      void this.store.order.applyPromotion().catch(function (error) {
+      var promotionRefreshTask = this.store.order.applyPromotion().then(function () {
+        return undefined;
+      });
+      this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;
+      void promotionRefreshTask.then(function () {
+        if (_this3.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask) return;
+        _this3.orderCustomerPromotionRefreshInFlight = null;
+      }, function (error) {
         console.error('[BookingTicket] applyPromotion after customer change failed', error);
+        if (_this3.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask) return;
+        _this3.orderCustomerPromotionRefreshInFlight = null;
       });
     }
 
@@ -1616,7 +1629,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function clearOrderCustomer() {
       var _discountModule$setOr,
         _discountModule$setDi,
-        _this3 = this;
+        _this4 = this;
       this.store.order.clearOrderCustomer();
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
@@ -1629,9 +1642,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         createIfMissing: true
       }).then(function () {
         var _discountModule$getDi;
-        var tempOrder = _this3.store.order.ensureTempOrder();
-        _this3.store.order.persistTempOrder();
-        return _this3.effectsEmit('onDiscountApplied', {
+        var tempOrder = _this4.store.order.ensureTempOrder();
+        _this4.store.order.persistTempOrder();
+        return _this4.effectsEmit('onDiscountApplied', {
           productList: tempOrder.products || [],
           discountList: (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [],
           selectedDiscountList: tempOrder.discount_list || [],
@@ -1692,14 +1705,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "refreshDiscountConfigAfterOrderCustomerChange",
     value: function refreshDiscountConfigAfterOrderCustomerChange(customerId) {
-      var _this4 = this;
-      if (!customerId || customerId === 1) return;
+      var _this5 = this;
+      if (!customerId || customerId === 1) return Promise.resolve();
       if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
-        return;
+        return this.orderCustomerDiscountRefreshInFlight;
       }
       var previousRefresh = this.orderCustomerDiscountRefreshInFlight;
       var refreshTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        var currentCustomer;
+        var _this5$store$order$ge, _this5$store$order, _this5$getOrderIdenti;
+        var currentCustomer, tempOrder, orderId, action;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -1712,18 +1726,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 return undefined;
               });
             case 3:
-              currentCustomer = _this4.store.order.getOrderCustomer();
+              currentCustomer = _this5.store.order.getOrderCustomer();
               if (!(!currentCustomer || Number(currentCustomer.customer_id) !== customerId)) {
                 _context22.next = 6;
                 break;
               }
               return _context22.abrupt("return");
             case 6:
-              _context22.next = 8;
-              return _this4.loadDiscountConfig({
-                customerId: customerId
+              tempOrder = (_this5$store$order$ge = (_this5$store$order = _this5.store.order).getTempOrder) === null || _this5$store$order$ge === void 0 ? void 0 : _this5$store$order$ge.call(_this5$store$order);
+              orderId = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || ((_this5$getOrderIdenti = _this5.getOrderIdentity) === null || _this5$getOrderIdenti === void 0 || (_this5$getOrderIdenti = _this5$getOrderIdenti.call(_this5)) === null || _this5$getOrderIdenti === void 0 ? void 0 : _this5$getOrderIdenti.orderId);
+              action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+              _context22.next = 11;
+              return _this5.loadDiscountConfig({
+                customerId: customerId,
+                action: action
               });
-            case 8:
+            case 11:
             case "end":
               return _context22.stop();
           }
@@ -1734,10 +1752,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       refreshTask.catch(function (error) {
         console.error('Failed to load discount config after customer change:', error);
       }).finally(function () {
-        if (_this4.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
-        _this4.orderCustomerDiscountRefreshInFlight = null;
-        _this4.orderCustomerDiscountRefreshCustomerId = null;
+        if (_this5.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
+        _this5.orderCustomerDiscountRefreshInFlight = null;
+        _this5.orderCustomerDiscountRefreshCustomerId = null;
       });
+      return refreshTask;
+    }
+  }, {
+    key: "waitForOrderCustomerPromotionRefresh",
+    value: function waitForOrderCustomerPromotionRefresh() {
+      return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
     }
 
     /**
@@ -1921,9 +1945,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "scanGlobalListener",
     value: function scanGlobalListener(callback) {
-      var _this5 = this;
+      var _this6 = this;
       var localSearch = function localSearch(v) {
-        return _this5.store.products.findProductsByCodeOrBarcode(v);
+        return _this6.store.products.findProductsByCodeOrBarcode(v);
       };
       var scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
       var safeCallback = function safeCallback(d) {
@@ -2399,7 +2423,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleGlobalScanCode",
     value: (function () {
       var _handleGlobalScanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(code, bridge) {
-        var _this6 = this;
+        var _this7 = this;
         var trimmed, _bridge$onNotify, _bridge$refresh, localSearch, scanCallback, raw, formatted, _bridge$onNotify2, _result7, _bridge$onNotify3;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -2417,7 +2441,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 4:
               _context28.prev = 4;
               localSearch = function localSearch(v) {
-                return _this6.store.products.findProductsByCodeOrBarcode(v);
+                return _this7.store.products.findProductsByCodeOrBarcode(v);
               };
               scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
               _context28.next = 9;
@@ -2441,35 +2465,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               _context28.next = 16;
               return applyGlobalScan({
                 setOrderCustomer: function setOrderCustomer(customer) {
-                  return _this6.setOrderCustomer(customer);
+                  return _this7.setOrderCustomer(customer);
                 },
                 getOrderCustomerSnapshot: function getOrderCustomerSnapshot() {
-                  return _this6.getOrderCustomerSnapshot();
+                  return _this7.getOrderCustomerSnapshot();
                 },
                 getBusinessCode: function getBusinessCode() {
-                  var _this6$otherParams;
-                  return (_this6$otherParams = _this6.otherParams) === null || _this6$otherParams === void 0 ? void 0 : _this6$otherParams.businessCode;
+                  var _this7$otherParams;
+                  return (_this7$otherParams = _this7.otherParams) === null || _this7$otherParams === void 0 ? void 0 : _this7$otherParams.businessCode;
                 },
                 buildAddProductCtx: function buildAddProductCtx(extra) {
-                  return _this6.buildAddProductCtx(extra);
+                  return _this7.buildAddProductCtx(extra);
                 },
                 decideAddProduct: function decideAddProduct(item, options) {
-                  return _this6.decideAddProduct(item, options);
+                  return _this7.decideAddProduct(item, options);
                 },
                 decideAfterDetail: function decideAfterDetail(cacheItem, options) {
-                  return _this6.decideAfterDetail(cacheItem, options);
+                  return _this7.decideAfterDetail(cacheItem, options);
                 },
                 transformDetailToProductAndBooking: function transformDetailToProductAndBooking(input) {
-                  return _this6.transformDetailToProductAndBooking(input);
+                  return _this7.transformDetailToProductAndBooking(input);
                 },
                 addProductToOrder: function addProductToOrder(product, booking) {
-                  return _this6.addProductToOrder(product, booking);
+                  return _this7.addProductToOrder(product, booking);
                 },
                 refreshWalletAssets: function refreshWalletAssets(params) {
-                  return _this6.refreshWalletAssets(params);
+                  return _this7.refreshWalletAssets(params);
                 },
                 scanWalletAsset: function scanWalletAsset(scanCode) {
-                  return _this6.scanWalletAsset(scanCode);
+                  return _this7.scanWalletAsset(scanCode);
                 }
               }, formatted, bridge);
             case 16:
@@ -2608,7 +2632,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "addAddTimeProductsToBooking",
     value: (function () {
       var _addAddTimeProductsToBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(input) {
-        var _this7 = this,
+        var _this8 = this,
           _input$bookingPatch;
         var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator2, _step2, line;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
@@ -2623,7 +2647,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 3:
               orderLines = (input.products || []).map(function (line) {
                 return {
-                  product: _this7.buildAddTimeOrderLine(line, bookingUid)
+                  product: _this8.buildAddTimeOrderLine(line, bookingUid)
                 };
               });
               if (this.store.order) {

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,6 +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。
@@ -72,6 +90,13 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected getDefaultCheckoutSmallTicketDataFlag(): number;
     protected getRegisteredModuleNames(): readonly string[];
     protected createSubModule(moduleName: string): Module | null;
+    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    syncAuthenticatedOrderCustomer(): Promise<boolean>;
+    private isAuthenticatedCustomerUserPlatform;
+    private resolveDiscountOrderIdentity;
+    private resolveDiscountAction;
+    private resetCachedCustomerDiscountState;
+    private refreshLegacySessionCustomerDiscounts;
     /**
      * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
      * business/channel target so a reused solution instance cannot leak another entry's menus.