@pisell/pisellos 0.0.508 → 0.0.510

package/dist/modules/Order/index.js

@@ -1,10 +1,10 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -25,7 +25,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, formatDateTime, formatV1Product, isTempOrder } from "./utils";
+import { generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, formatDateTime, filterProductsForScanOrderMore, formatV1Product, isTempOrder } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { getProductIdentityIndex, getSafeProductNum, isIdentityMatch, normalizeOrderProduct } from "../../solution/ScanOrder/utils";
@@ -387,6 +387,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           this.window.localStorage.removeItem(key);
           return;
         }
+        if (Array.isArray(parsedData.products)) {
+          var _iterator = _createForOfIteratorHelper(parsedData.products),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var p = _step.value;
+              if (!p || _typeof(p) !== 'object') continue;
+              if (!Array.isArray(p.product_option_item)) {
+                p.product_option_item = [];
+              }
+              if (!Array.isArray(p.product_bundle)) {
+                p.product_bundle = [];
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
         this.store.tempOrder = parsedData;
       } catch (_unused2) {
         var _this$window;
@@ -676,32 +696,23 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductFromOrder",
     value: function () {
       var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(identity) {
-        var tempOrder, beforeProducts, removedByStrictIdentity;
+        var tempOrder;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
-              beforeProducts = tempOrder.products;
               tempOrder.products = tempOrder.products.filter(function (item) {
                 return !isIdentityMatch(item, identity);
               });
-              removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-              if (removedByStrictIdentity === 0 && identity.identity_key) {
-                tempOrder.products = tempOrder.products.filter(function (item) {
-                  var isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-                  var hasNoIdentityKey = !item.identity_key;
-                  return !(isSameProduct && hasNoIdentityKey);
-                });
-              }
               this.applyDiscount();
-              _context9.next = 8;
+              _context9.next = 5;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 8:
+            case 5:
               this.persistTempOrder();
               return _context9.abrupt("return", tempOrder.products);
-            case 10:
+            case 7:
             case "end":
               return _context9.stop();
           }
@@ -737,7 +748,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 _context10.next = 12;
                 break;
               }
-              products = formatV1Product(payload.products);
+              products = formatV1Product(filterProductsForScanOrderMore(payload.products));
               _context10.next = 8;
               return this.scanOrderMore({
                 query: {
@@ -1135,46 +1146,46 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
      */
     function populateSavedAmounts(productList, discountList) {
       var savedMap = new Map();
-      var _iterator = _createForOfIteratorHelper(productList),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(productList),
+        _step2;
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var product = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var product = _step2.value;
           var qty = product.num || 1;
-          var _iterator3 = _createForOfIteratorHelper(product.discount_list || []),
-            _step3;
+          var _iterator4 = _createForOfIteratorHelper(product.discount_list || []),
+            _step4;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _pd$discount, _pd$metadata;
-              var pd = _step3.value;
+              var pd = _step4.value;
               var discountKey = ((_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) || pd.id;
               if (discountKey == null) continue;
               var amount = new Decimal(pd.amount || 0).times(qty).plus(((_pd$metadata = pd.metadata) === null || _pd$metadata === void 0 ? void 0 : _pd$metadata.product_discount_difference) || 0);
               savedMap.set(discountKey, (savedMap.get(discountKey) || new Decimal(0)).plus(amount));
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator3.f();
+            _iterator4.f();
           }
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
-      var _iterator2 = _createForOfIteratorHelper(discountList),
-        _step2;
+      var _iterator3 = _createForOfIteratorHelper(discountList),
+        _step3;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var d = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var d = _step3.value;
           var key = d.id;
           d.savedAmount = d.isSelected && key != null && savedMap.has(key) ? savedMap.get(key).toNumber() : 0;
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
     }
   }]);

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

@@ -72,6 +72,8 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export declare function filterProductsForScanOrderMore(products: ScanOrderSubmitProduct[]): ScanOrderSubmitProduct[];
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
     key: number | null;

package/dist/modules/Order/utils.js

@@ -18,7 +18,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from "dayjs";
 import Decimal from 'decimal.js';
-import { createEmptySummary } from "../../solution/ScanOrder/utils";
+import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 /**
  * OrderModule 默认 Rules 钩子工厂。
  *
@@ -47,7 +47,9 @@ export function createDefaultOrderRulesHooks() {
       var _product$_origin, _product$_origin2, _product$_origin3, _product$_origin4;
       return {
         id: product.product_id,
-        _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id),
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        _id: product.identity_key ? "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(product.identity_key) : "".concat(product.product_id, "_").concat(product.product_variant_id, "_").concat(buildProductLineFingerprint(product.product_option_item, product.product_bundle)),
         price: product.selling_price,
         total: new Decimal(product.selling_price || 0).times(product.num || 1).toNumber(),
         origin_total: new Decimal(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
@@ -390,6 +392,14 @@ export function buildSubmitPayload(params) {
     now: now
   }) : payload;
 }
+
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export function filterProductsForScanOrderMore(products) {
+  return (products || []).filter(function (p) {
+    var _p$metadata;
+    return ((_p$metadata = p.metadata) === null || _p$metadata === void 0 ? void 0 : _p$metadata.is_rule) !== true;
+  });
+}
 export function formatV1Product(products) {
   return products.map(function (product) {
     return {

package/dist/solution/ScanOrder/index.js

@@ -30,7 +30,7 @@ import { OrderModule } from "../../modules/Order";
 import { AccountHooks } from "../../modules/Account/types";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
-import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, createEmptySummary, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toPriceString, toBoolean, toPositiveString } from "./utils";
+import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleBusinessData, collectLinkProductIdsFromReservationRules, computeResourceIsFull, createEmptySummary, getProductIdentityIndex, getSafeProductNum, hasCustomCapacityProduct, pickFirstCustomCapacityDimensionId, pickFirstCustomCapacityPaxBounds, normalizeEnabledItemRuleIds, normalizeOrderProduct, normalizeItemRuleStrategies, pickFirstDurationMinutesFromProducts, toNonNegativeInt, toPriceString, toBoolean, toPositiveString } from "./utils";
 import { createModule } from "../BookingByStep/types";
 import { ProductList } from "../../modules/ProductList";
 import { ScheduleModule } from "../../modules/Schedule";
@@ -1195,6 +1195,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildSubmitPayloadEnhancer",
     value: function buildSubmitPayloadEnhancer() {
+      var _this5 = this;
       var ruleProduct = this.enabledReservationRuleProducts[0];
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
@@ -1211,7 +1212,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return 1;
       };
       return function (payload, _ref3) {
-        var _tempOrder$resource_i, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati;
+        var _tempOrder$resource_i, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati, _tempOrder$metadata, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
           tempOrder = _ref3.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
@@ -1234,7 +1235,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           metadata: {}
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
-        var bookingCapacityValue = resolveResourceCapacity();
+        // 默认 resolveResourceCapacity（single 为桌台容量，其余多为 1）；有 collect_pax 时 value 优先用人数
+        var rawCollectPax = (_tempOrder$metadata = tempOrder.metadata) === null || _tempOrder$metadata === void 0 ? void 0 : _tempOrder$metadata.collect_pax;
+        var hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== undefined && rawCollectPax !== '';
+        var bookingCapacityValue = hasCollectPaxForCapacity ? normalizeSubmitCollectPaxValue(rawCollectPax) : resolveResourceCapacity();
+        var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {
             appointment_status: 'started',
@@ -1242,7 +1247,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               resource_select_type: resourceSelectType
             } : {}), resourceSelectType ? {
               capacity: [{
-                id: 0,
+                id: bookingCapacityDimensionId,
                 value: bookingCapacityValue,
                 name: ''
               }]
@@ -1254,7 +1259,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           } : {});
         });
         var nextProducts = _toConsumableArray(payload.products || []);
-        if (ruleProduct && ruleProductUid) {
+        // 加餐（已有 order_id）走 scanOrderMore，原单已含 booking 规则行，勿再追加虚拟规则商品
+        if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
           var _ruleProduct$price, _ref5, _ruleProduct$original, _ruleProduct$is_gst;
           var sellingPrice = String((_ruleProduct$price = ruleProduct.price) !== null && _ruleProduct$price !== void 0 ? _ruleProduct$price : '0.00');
           var originalPrice = String((_ref5 = (_ruleProduct$original = ruleProduct.original_price) !== null && _ruleProduct$original !== void 0 ? _ruleProduct$original : ruleProduct.price) !== null && _ref5 !== void 0 ? _ref5 : '0.00');
@@ -1719,7 +1725,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var _this5 = this;
+        var _this6 = this;
         var loadedConfigs;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
@@ -1741,19 +1747,19 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee24$(_context24) {
                   while (1) switch (_context24.prev = _context24.next) {
                     case 0:
-                      runtimeConfig = _this5.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this6.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context24.next = 6;
                         break;
                       }
-                      _this5.itemRuleConfigs = staticConfigs;
-                      _this5.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context24.abrupt("return", _this5.itemRuleConfigs);
+                      _this6.itemRuleConfigs = staticConfigs;
+                      _this6.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context24.abrupt("return", _this6.itemRuleConfigs);
                     case 6:
-                      _this5.itemRuleConfigs = [];
-                      _this5.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context24.abrupt("return", _this5.itemRuleConfigs);
+                      _this6.itemRuleConfigs = [];
+                      _this6.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context24.abrupt("return", _this6.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context24.stop();
@@ -2207,7 +2213,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
       var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
-      var allowSnack = ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 || (_this$otherParams8 = _this$otherParams8.dineInConfig) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8['workflow.allow_add_items']) || false;
+      var allowSnack = ((_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 || (_this$otherParams8 = _this$otherParams8.dineInConfig) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8['sale.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
       var isExclusive = resourceSelectType === 'single';
@@ -2723,11 +2729,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
-    }() // ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
+    }() // ─── UI 状态缓存（按 cacheId 分桶，localStorage） ───
     //
     // 用于物料层持久化 UI 层面的轻量状态（如当前步骤、gate 标记、登录回跳意图等）。
     // 桶键：pisell.scanOrder.uiState:<cacheId>；内部以 JSON object 形式存储多个字段。
     // 无 cacheId 时所有方法自动降级为 no-op，上层不用判空。
+    //
+    // 之所以用 localStorage 而不是 sessionStorage：
+    //   1. 与 Order 模块 openCache 下的 tempOrder 同栈，购物车在 / UIState 在，行为对齐；
+    //   2. pisell1.login 整页 OAuth 跳转在 H5 壳 / iOS Safari 场景下可能丢 sessionStorage，
+    //      导致登录回跳后 gate 标记失效、pax 弹窗重开、落点错误；localStorage 稳定不受影响。
+    //   3. 失效由上层显式控制：提交成功 clearStepCache / entryContext 不一致 clearUIState /
+    //      pendingStep 登录回调 deleteUIState，足够约束生命周期。
   }, {
     key: "getUIStateBucketKey",
     value: function getUIStateBucketKey() {
@@ -2739,9 +2752,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function readUIStateBucket() {
       var _this$window;
       var key = this.getUIStateBucketKey();
-      if (!key || !((_this$window = this.window) !== null && _this$window !== void 0 && _this$window.sessionStorage)) return {};
+      if (!key || !((_this$window = this.window) !== null && _this$window !== void 0 && _this$window.localStorage)) return {};
       try {
-        var raw = this.window.sessionStorage.getItem(key) || '{}';
+        var raw = this.window.localStorage.getItem(key) || '{}';
         var parsed = JSON.parse(raw);
         return parsed && _typeof(parsed) === 'object' ? parsed : {};
       } catch (_unused) {
@@ -2753,9 +2766,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function writeUIStateBucket(bucket) {
       var _this$window2;
       var key = this.getUIStateBucketKey();
-      if (!key || !((_this$window2 = this.window) !== null && _this$window2 !== void 0 && _this$window2.sessionStorage)) return;
+      if (!key || !((_this$window2 = this.window) !== null && _this$window2 !== void 0 && _this$window2.localStorage)) return;
       try {
-        this.window.sessionStorage.setItem(key, JSON.stringify(bucket));
+        this.window.localStorage.setItem(key, JSON.stringify(bucket));
       } catch (error) {
         console.warn('[ScanOrder] writeUIStateBucket failed', error);
       }
@@ -2792,9 +2805,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     value: function clearUIState() {
       var _this$window3;
       var key = this.getUIStateBucketKey();
-      if (!key || !((_this$window3 = this.window) !== null && _this$window3 !== void 0 && _this$window3.sessionStorage)) return;
+      if (!key || !((_this$window3 = this.window) !== null && _this$window3 !== void 0 && _this$window3.localStorage)) return;
       try {
-        this.window.sessionStorage.removeItem(key);
+        this.window.localStorage.removeItem(key);
       } catch (error) {
         console.warn('[ScanOrder] clearUIState failed', error);
       }

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

@@ -31,6 +31,9 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
+    product_option_item?: any[];
+    product_bundle?: any[];
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

package/dist/solution/ScanOrder/utils.d.ts

@@ -81,10 +81,27 @@ export declare function buildItemRuleBusinessData(params: {
     itemRuleConfigs: StrategyConfig[];
 }): ItemRuleBusinessData;
 export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T, limits: QuantityLimitResult[]): T;
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export declare function buildSyntheticSingleOptionIdentityKey(productId: number | null, productOptionItem: unknown): string | undefined;
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: ScanOrderOrderProductIdentity): boolean;
 /**
@@ -129,3 +146,8 @@ export declare function pickFirstCustomCapacityPaxBounds(products: ProductData[]
     min?: number;
     max?: number;
 } | undefined;
+/**
+ * 第一个 `capacity.type === 'custom'` 的商品，取其 `custom[0].id`（提交 booking metadata.capacity 维度 id）。
+ * 无匹配时返回 `undefined`，调用方应回退为 `0`。
+ */
+export declare function pickFirstCustomCapacityDimensionId(products: ProductData[]): string | number | undefined;

package/dist/solution/ScanOrder/utils.js

@@ -366,15 +366,116 @@ export function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   return productList;
 }
 
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export function buildProductLineFingerprint(productOptionItem, productBundle) {
+  var optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  var normalizedOpts = optArr.map(function (item) {
+    var _item$price;
+    return {
+      product_option_item_id: Number(item === null || item === void 0 ? void 0 : item.product_option_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((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : '')
+    };
+  }).sort(function (p, q) {
+    if (p.product_option_item_id !== q.product_option_item_id) {
+      return p.product_option_item_id - q.product_option_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 bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  var normalizedBundles = bundleArr.map(function (item) {
+    var _ref, _item$bundle_id;
+    return {
+      bundle_id: Number((_ref = (_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 && _ref !== void 0 ? _ref : 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
+    };
+  }).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;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key) return false;
+  return !('product_option_item' in x) && !('product_bundle' in x);
+}
+
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export function buildSyntheticSingleOptionIdentityKey(productId, productOptionItem) {
+  if (productId == null || !Number.isFinite(Number(productId))) return undefined;
+  var opts = Array.isArray(productOptionItem) ? productOptionItem : [];
+  if (opts.length !== 1) return undefined;
+  var o = opts[0];
+  var gid = Number(o === null || o === void 0 ? void 0 : o.option_group_id) || 0;
+  var oid = Number(o === null || o === void 0 ? void 0 : o.product_option_item_id) || 0;
+  var rawNum = o === null || o === void 0 ? void 0 : o.num;
+  var n = typeof rawNum === 'number' && !Number.isNaN(rawNum) ? Math.max(1, Math.floor(rawNum)) : 1;
+  return "".concat(productId, "_").concat(gid, "_").concat(oid, "_").concat(n);
+}
+function collectLineIdentityKeyCandidates(x) {
+  var _row$metadata;
+  var out = new Set();
+  var row = x;
+  if (typeof row.identity_key === 'string' && row.identity_key.length > 0) {
+    out.add(row.identity_key);
+  }
+  var uid = (_row$metadata = row.metadata) === null || _row$metadata === void 0 ? void 0 : _row$metadata.unique_identification_number;
+  if (typeof uid === 'string' && uid.length > 0) out.add(uid);
+  var synthetic = buildSyntheticSingleOptionIdentityKey(row.product_id, row.product_option_item);
+  if (synthetic) out.add(synthetic);
+  var opts = 'product_option_item' in row && Array.isArray(row.product_option_item) ? row.product_option_item : [];
+  var bundles = 'product_bundle' in row && Array.isArray(row.product_bundle) ? row.product_bundle : [];
+  // 无小料且无套餐时，与常见 UI 约定对齐：`${product_id}_${product_variant_id}_0`
+  if (opts.length === 0 && bundles.length === 0 && row.product_id != null && Number.isFinite(Number(row.product_id))) {
+    var vid = Number(row.product_variant_id) || 0;
+    out.add("".concat(row.product_id, "_").concat(vid, "_0"));
+  }
+  return out;
+}
+function fingerprintForIdentityWithOptionKeys(x) {
+  var row = x;
+  var opts = 'product_option_item' in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  var buds = 'product_bundle' in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
+  return buildProductLineFingerprint(opts, buds);
+}
+
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id) return false;
-  if (!a.identity_key && !b.identity_key) return true;
-  return a.identity_key === b.identity_key;
+  if (a.identity_key || b.identity_key) {
+    if (a.identity_key && b.identity_key) return a.identity_key === b.identity_key;
+    if (a.identity_key && !b.identity_key) {
+      return collectLineIdentityKeyCandidates(b).has(a.identity_key);
+    }
+    if (!a.identity_key && b.identity_key) {
+      return collectLineIdentityKeyCandidates(a).has(b.identity_key);
+    }
+    return false;
+  }
+  if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b)) return true;
+  return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
 
 /**
@@ -414,14 +515,14 @@ export function normalizeOrderProduct(product) {
     metadata.main_product_selling_price = resolvedSellingPrice;
   }
   if (metadata.source_product_price === undefined) {
-    var _ref, _product$_origin$pric, _product$_origin, _product$_origin2;
-    metadata.source_product_price = (_ref = (_product$_origin$pric = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price) !== null && _product$_origin$pric !== void 0 ? _product$_origin$pric : (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price) !== null && _ref !== void 0 ? _ref : resolvedSellingPrice;
+    var _ref2, _product$_origin$pric, _product$_origin, _product$_origin2;
+    metadata.source_product_price = (_ref2 = (_product$_origin$pric = (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.price) !== null && _product$_origin$pric !== void 0 ? _product$_origin$pric : (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.base_price) !== null && _ref2 !== void 0 ? _ref2 : resolvedSellingPrice;
   }
   var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$custom_price;
+    var _ref3, _item$bundle_selling_, _ref4, _ref5, _item$custom_price;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
-      custom_price: (_ref3 = (_ref4 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00'
+      bundle_selling_price: (_ref3 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00',
+      custom_price: (_ref4 = (_ref5 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : item.price) !== null && _ref4 !== void 0 ? _ref4 : '0.00'
     });
   });
   return {
@@ -580,4 +681,36 @@ export function pickFirstCustomCapacityPaxBounds(products) {
     _iterator9.f();
   }
   return undefined;
+}
+
+/**
+ * 第一个 `capacity.type === 'custom'` 的商品，取其 `custom[0].id`（提交 booking metadata.capacity 维度 id）。
+ * 无匹配时返回 `undefined`，调用方应回退为 `0`。
+ */
+export function pickFirstCustomCapacityDimensionId(products) {
+  var _iterator10 = _createForOfIteratorHelper(products),
+    _step10;
+  try {
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var p = _step10.value;
+      var cap = p === null || p === void 0 ? void 0 : p.capacity;
+      if (!cap || cap.type !== 'custom') continue;
+      if (!Array.isArray(cap.custom) || cap.custom.length === 0) continue;
+      var row = cap.custom[0];
+      if (!row || _typeof(row) !== 'object') continue;
+      var id = row.id;
+      if (id === null || id === undefined || id === '') continue;
+      if (typeof id === 'number' && Number.isFinite(id)) return id;
+      if (typeof id === 'string') {
+        var trimmed = id.trim();
+        if (!trimmed) continue;
+        return trimmed;
+      }
+    }
+  } catch (err) {
+    _iterator10.e(err);
+  } finally {
+    _iterator10.f();
+  }
+  return undefined;
 }

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

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

package/lib/modules/Order/index.js

@@ -288,6 +288,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.window.localStorage.removeItem(key);
         return;
       }
+      if (Array.isArray(parsedData.products)) {
+        for (const p of parsedData.products) {
+          if (!p || typeof p !== "object")
+            continue;
+          if (!Array.isArray(p.product_option_item)) {
+            p.product_option_item = [];
+          }
+          if (!Array.isArray(p.product_bundle)) {
+            p.product_bundle = [];
+          }
+        }
+      }
       this.store.tempOrder = parsedData;
     } catch {
       (_b = (_a = this.window) == null ? void 0 : _a.localStorage) == null ? void 0 : _b.removeItem(key);
@@ -444,18 +456,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async removeProductFromOrder(identity) {
     const tempOrder = this.ensureTempOrder();
-    const beforeProducts = tempOrder.products;
     tempOrder.products = tempOrder.products.filter(
       (item) => !(0, import_utils3.isIdentityMatch)(item, identity)
     );
-    const removedByStrictIdentity = beforeProducts.length - tempOrder.products.length;
-    if (removedByStrictIdentity === 0 && identity.identity_key) {
-      tempOrder.products = tempOrder.products.filter((item) => {
-        const isSameProduct = String(item.product_id) === String(identity.product_id) && String(item.product_variant_id) === String(identity.product_variant_id);
-        const hasNoIdentityKey = !item.identity_key;
-        return !(isSameProduct && hasNoIdentityKey);
-      });
-    }
     this.applyDiscount();
     await this.recalculateSummary({ createIfMissing: true });
     this.persistTempOrder();
@@ -477,7 +480,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     let result;
     if (tempOrder.order_id) {
-      const products = (0, import_utils.formatV1Product)(payload.products);
+      let products = (0, import_utils.formatV1Product)(
+        (0, import_utils.filterProductsForScanOrderMore)(payload.products)
+      );
       const moreResult = await this.scanOrderMore({
         query: {
           order_id: tempOrder.order_id,

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

@@ -72,6 +72,8 @@ export declare function buildSubmitPayload(params: {
     type?: string;
     enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
+/** 加单（scanOrderMore）不应提交 booking 关联的虚拟规则商品行 */
+export declare function filterProductsForScanOrderMore(products: ScanOrderSubmitProduct[]): ScanOrderSubmitProduct[];
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
     key: number | null;

package/lib/modules/Order/utils.js

@@ -34,6 +34,7 @@ __export(utils_exports, {
   createDefaultTempOrder: () => createDefaultTempOrder,
   createEmptySummary: () => import_utils2.createEmptySummary,
   createUuidV4: () => createUuidV4,
+  filterProductsForScanOrderMore: () => filterProductsForScanOrderMore,
   formatDateTime: () => formatDateTime,
   formatV1Product: () => formatV1Product,
   generateDuration: () => generateDuration,
@@ -59,7 +60,12 @@ function createDefaultOrderRulesHooks() {
       var _a, _b, _c, _d;
       return {
         id: product.product_id,
-        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}`,
+        // Rules 引擎用 _id 作为 processedProductsMap 键；必须与购物车行级 identity 一致，
+        // 否则同 SKU 不同小料会在 calcDiscount 重组时互相覆盖。
+        _id: product.identity_key ? `${product.product_id}_${product.product_variant_id}_${product.identity_key}` : `${product.product_id}_${product.product_variant_id}_${(0, import_utils.buildProductLineFingerprint)(
+          product.product_option_item,
+          product.product_bundle
+        )}`,
         price: product.selling_price,
         total: new import_decimal.default(product.selling_price || 0).times(product.num || 1).toNumber(),
         origin_total: new import_decimal.default(product.original_price || product.selling_price || 0).times(product.num || 1).toNumber(),
@@ -366,6 +372,12 @@ function buildSubmitPayload(params) {
   };
   return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
 }
+function filterProductsForScanOrderMore(products) {
+  return (products || []).filter((p) => {
+    var _a;
+    return ((_a = p.metadata) == null ? void 0 : _a.is_rule) !== true;
+  });
+}
 function formatV1Product(products) {
   return products.map((product) => {
     return {
@@ -388,6 +400,7 @@ function formatV1Product(products) {
   createDefaultTempOrder,
   createEmptySummary,
   createUuidV4,
+  filterProductsForScanOrderMore,
   formatDateTime,
   formatV1Product,
   generateDuration,

package/lib/solution/ScanOrder/index.js

@@ -741,7 +741,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       return 1;
     };
     return (payload, { bookingUuid, tempOrder }) => {
-      var _a;
+      var _a, _b;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
       const pickOriginal = (value) => {
         if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -762,20 +762,31 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         metadata: {}
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
-      const bookingCapacityValue = resolveResourceCapacity();
+      const rawCollectPax = (_b = tempOrder.metadata) == null ? void 0 : _b.collect_pax;
+      const hasCollectPaxForCapacity = rawCollectPax !== null && rawCollectPax !== void 0 && rawCollectPax !== "";
+      const bookingCapacityValue = hasCollectPaxForCapacity ? (0, import_utils2.normalizeSubmitCollectPaxValue)(rawCollectPax) : resolveResourceCapacity();
+      const bookingCapacityDimensionId = (0, import_utils.pickFirstCustomCapacityDimensionId)(this.enabledReservationRuleProducts) ?? 0;
       const nextBookings = (payload.bookings || []).map((booking, idx) => ({
         ...booking,
         appointment_status: "started",
         metadata: {
           ...booking.metadata || {},
           ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
-          ...resourceSelectType ? { capacity: [{ id: 0, value: bookingCapacityValue, name: "" }] } : {}
+          ...resourceSelectType ? {
+            capacity: [
+              {
+                id: bookingCapacityDimensionId,
+                value: bookingCapacityValue,
+                name: ""
+              }
+            ]
+          } : {}
         },
         ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
         ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
       }));
       const nextProducts = [...payload.products || []];
-      if (ruleProduct && ruleProductUid) {
+      if (ruleProduct && ruleProductUid && !tempOrder.order_id) {
         const sellingPrice = String(ruleProduct.price ?? "0.00");
         const originalPrice = String(
           ruleProduct.original_price ?? ruleProduct.price ?? "0.00"
@@ -1261,7 +1272,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const relationId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.form_record_id);
     const tableFormId = (0, import_utils.toPositiveString)(detail == null ? void 0 : detail.form_id);
     const formRecord = (detail == null ? void 0 : detail.form_record) ?? null;
-    const allowSnack = ((_b = (_a = this.otherParams) == null ? void 0 : _a.dineInConfig) == null ? void 0 : _b["workflow.allow_add_items"]) || false;
+    const allowSnack = ((_b = (_a = this.otherParams) == null ? void 0 : _a.dineInConfig) == null ? void 0 : _b["sale.allow_add_items"]) || false;
     const deskmateValid = false;
     const isExclusive = resourceSelectType === "single";
     const isFull = (0, import_utils.computeResourceIsFull)({
@@ -1620,10 +1631,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   readUIStateBucket() {
     var _a;
     const key = this.getUIStateBucketKey();
-    if (!key || !((_a = this.window) == null ? void 0 : _a.sessionStorage))
+    if (!key || !((_a = this.window) == null ? void 0 : _a.localStorage))
       return {};
     try {
-      const raw = this.window.sessionStorage.getItem(key) || "{}";
+      const raw = this.window.localStorage.getItem(key) || "{}";
       const parsed = JSON.parse(raw);
       return parsed && typeof parsed === "object" ? parsed : {};
     } catch {
@@ -1633,10 +1644,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   writeUIStateBucket(bucket) {
     var _a;
     const key = this.getUIStateBucketKey();
-    if (!key || !((_a = this.window) == null ? void 0 : _a.sessionStorage))
+    if (!key || !((_a = this.window) == null ? void 0 : _a.localStorage))
       return;
     try {
-      this.window.sessionStorage.setItem(key, JSON.stringify(bucket));
+      this.window.localStorage.setItem(key, JSON.stringify(bucket));
     } catch (error) {
       console.warn("[ScanOrder] writeUIStateBucket failed", error);
     }
@@ -1667,10 +1678,10 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   clearUIState() {
     var _a;
     const key = this.getUIStateBucketKey();
-    if (!key || !((_a = this.window) == null ? void 0 : _a.sessionStorage))
+    if (!key || !((_a = this.window) == null ? void 0 : _a.localStorage))
       return;
     try {
-      this.window.sessionStorage.removeItem(key);
+      this.window.localStorage.removeItem(key);
     } catch (error) {
       console.warn("[ScanOrder] clearUIState failed", error);
     }
@@ -1726,11 +1737,18 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
 };
 var ScanOrderImpl = _ScanOrderImpl;
 ScanOrderImpl.PISELL1_LOGIN_SUCCESS = "pisell1.login.success";
-// ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
+// ─── UI 状态缓存（按 cacheId 分桶，localStorage） ───
 //
 // 用于物料层持久化 UI 层面的轻量状态（如当前步骤、gate 标记、登录回跳意图等）。
 // 桶键：pisell.scanOrder.uiState:<cacheId>；内部以 JSON object 形式存储多个字段。
 // 无 cacheId 时所有方法自动降级为 no-op，上层不用判空。
+//
+// 之所以用 localStorage 而不是 sessionStorage：
+//   1. 与 Order 模块 openCache 下的 tempOrder 同栈，购物车在 / UIState 在，行为对齐；
+//   2. pisell1.login 整页 OAuth 跳转在 H5 壳 / iOS Safari 场景下可能丢 sessionStorage，
+//      导致登录回跳后 gate 标记失效、pax 弹窗重开、落点错误；localStorage 稳定不受影响。
+//   3. 失效由上层显式控制：提交成功 clearStepCache / entryContext 不一致 clearUIState /
+//      pendingStep 登录回调 deleteUIState，足够约束生命周期。
 ScanOrderImpl.UI_STATE_KEY_PREFIX = "pisell.scanOrder.uiState:";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/ScanOrder/types.d.ts

@@ -31,6 +31,9 @@ export interface ScanOrderOrderProductIdentity {
     product_id: number | null;
     product_variant_id: number;
     identity_key?: string;
+    /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
+    product_option_item?: any[];
+    product_bundle?: any[];
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;

package/lib/solution/ScanOrder/utils.d.ts

@@ -81,10 +81,27 @@ export declare function buildItemRuleBusinessData(params: {
     itemRuleConfigs: StrategyConfig[];
 }): ItemRuleBusinessData;
 export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T, limits: QuantityLimitResult[]): T;
+/**
+ * 将选项行 / 套餐行归一成稳定 JSON，用于「同 SKU 是否合并」判断。
+ * 数组元素先按主键排序再序列化，避免顺序差异导致误判为不同行。
+ */
+export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
+/**
+ * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
+ * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ */
+export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
+/**
+ * 与常见 UI 约定一致：仅当存在**一条** `product_option_item` 时，
+ * `${product_id}_${option_group_id}_${product_option_item_id}_${num}` 可作为删除用 `identity_key`。
+ * 多小料行请使用加购时的 `identity_key` / `metadata.unique_identification_number` 或按 `product_option_item` 指纹删除。
+ */
+export declare function buildSyntheticSingleOptionIdentityKey(productId: number | null, productOptionItem: unknown): string | undefined;
 /**
  * 判断两个商品 identity 是否匹配。
- * 当双方都没有 identity_key 时回退到 product_id + product_variant_id 比较（向后兼容）；
- * 一旦有一方携带 identity_key，则必须严格相等。
+ * - 任一方带 `identity_key`：两侧都有则比字符串相等；仅一侧有则比「另一侧有效 key 集合」是否含该 key（见 collectLineIdentityKeyCandidates）。
+ * - 否则若任一方为「仅 SKU」删除通配（未声明 product_option_item / product_bundle 键），只比 SKU。
+ * - 否则比较选项 + 套餐指纹（同 SKU 且指纹相同才合并数量）。
  */
 export declare function isIdentityMatch(a: ScanOrderOrderProductIdentity, b: ScanOrderOrderProductIdentity): boolean;
 /**
@@ -129,3 +146,8 @@ export declare function pickFirstCustomCapacityPaxBounds(products: ProductData[]
     min?: number;
     max?: number;
 } | undefined;
+/**
+ * 第一个 `capacity.type === 'custom'` 的商品，取其 `custom[0].id`（提交 booking metadata.capacity 维度 id）。
+ * 无匹配时返回 `undefined`，调用方应回退为 `0`。
+ */
+export declare function pickFirstCustomCapacityDimensionId(products: ProductData[]): string | number | undefined;

package/lib/solution/ScanOrder/utils.js

@@ -33,7 +33,9 @@ __export(utils_exports, {
   attachItemRuleLimitsToTopLevelProducts: () => attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData: () => buildItemRuleBusinessData,
   buildProductKey: () => buildProductKey,
+  buildProductLineFingerprint: () => buildProductLineFingerprint,
   buildQuantityLimitIndex: () => buildQuantityLimitIndex,
+  buildSyntheticSingleOptionIdentityKey: () => buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules: () => collectLinkProductIdsFromReservationRules,
   computeResourceIsFull: () => computeResourceIsFull,
   createEmptySummary: () => createEmptySummary,
@@ -44,9 +46,11 @@ __export(utils_exports, {
   getTopLevelVariantId: () => getTopLevelVariantId,
   hasCustomCapacityProduct: () => hasCustomCapacityProduct,
   isIdentityMatch: () => isIdentityMatch,
+  isSkuOnlyDeleteIdentity: () => isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
+  pickFirstCustomCapacityDimensionId: () => pickFirstCustomCapacityDimensionId,
   pickFirstCustomCapacityPaxBounds: () => pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts: () => pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits: () => resolveSkuMatchedQuantityLimits,
@@ -338,12 +342,102 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   }
   return productList;
 }
+function buildProductLineFingerprint(productOptionItem, productBundle) {
+  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
+  const normalizedOpts = optArr.map((item) => ({
+    product_option_item_id: Number(item == null ? void 0 : item.product_option_item_id) || 0,
+    option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    price: String((item == null ? void 0 : item.price) ?? "")
+  })).sort((p, q) => {
+    if (p.product_option_item_id !== q.product_option_item_id) {
+      return p.product_option_item_id - q.product_option_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);
+  });
+  const bundleArr = Array.isArray(productBundle) ? productBundle : [];
+  const normalizedBundles = bundleArr.map((item) => ({
+    bundle_id: Number((item == null ? void 0 : item.bundle_id) ?? (item == null ? void 0 : item.id) ?? 0) || 0,
+    product_id: Number(item == null ? void 0 : item.product_id) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1
+  })).sort((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;
+  });
+  return JSON.stringify([normalizedOpts, normalizedBundles]);
+}
+function isSkuOnlyDeleteIdentity(x) {
+  if (x.identity_key)
+    return false;
+  return !("product_option_item" in x) && !("product_bundle" in x);
+}
+function buildSyntheticSingleOptionIdentityKey(productId, productOptionItem) {
+  if (productId == null || !Number.isFinite(Number(productId)))
+    return void 0;
+  const opts = Array.isArray(productOptionItem) ? productOptionItem : [];
+  if (opts.length !== 1)
+    return void 0;
+  const o = opts[0];
+  const gid = Number(o == null ? void 0 : o.option_group_id) || 0;
+  const oid = Number(o == null ? void 0 : o.product_option_item_id) || 0;
+  const rawNum = o == null ? void 0 : o.num;
+  const n = typeof rawNum === "number" && !Number.isNaN(rawNum) ? Math.max(1, Math.floor(rawNum)) : 1;
+  return `${productId}_${gid}_${oid}_${n}`;
+}
+function collectLineIdentityKeyCandidates(x) {
+  var _a;
+  const out = /* @__PURE__ */ new Set();
+  const row = x;
+  if (typeof row.identity_key === "string" && row.identity_key.length > 0) {
+    out.add(row.identity_key);
+  }
+  const uid = (_a = row.metadata) == null ? void 0 : _a.unique_identification_number;
+  if (typeof uid === "string" && uid.length > 0)
+    out.add(uid);
+  const synthetic = buildSyntheticSingleOptionIdentityKey(
+    row.product_id,
+    row.product_option_item
+  );
+  if (synthetic)
+    out.add(synthetic);
+  const opts = "product_option_item" in row && Array.isArray(row.product_option_item) ? row.product_option_item : [];
+  const bundles = "product_bundle" in row && Array.isArray(row.product_bundle) ? row.product_bundle : [];
+  if (opts.length === 0 && bundles.length === 0 && row.product_id != null && Number.isFinite(Number(row.product_id))) {
+    const vid = Number(row.product_variant_id) || 0;
+    out.add(`${row.product_id}_${vid}_0`);
+  }
+  return out;
+}
+function fingerprintForIdentityWithOptionKeys(x) {
+  const row = x;
+  const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const buds = "product_bundle" in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
+  return buildProductLineFingerprint(opts, buds);
+}
 function isIdentityMatch(a, b) {
   if (a.product_id !== b.product_id || a.product_variant_id !== b.product_variant_id)
     return false;
-  if (!a.identity_key && !b.identity_key)
+  if (a.identity_key || b.identity_key) {
+    if (a.identity_key && b.identity_key)
+      return a.identity_key === b.identity_key;
+    if (a.identity_key && !b.identity_key) {
+      return collectLineIdentityKeyCandidates(b).has(a.identity_key);
+    }
+    if (!a.identity_key && b.identity_key) {
+      return collectLineIdentityKeyCandidates(a).has(b.identity_key);
+    }
+    return false;
+  }
+  if (isSkuOnlyDeleteIdentity(a) || isSkuOnlyDeleteIdentity(b))
     return true;
-  return a.identity_key === b.identity_key;
+  return fingerprintForIdentityWithOptionKeys(a) === fingerprintForIdentityWithOptionKeys(b);
 }
 function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
@@ -474,13 +568,39 @@ function pickFirstCustomCapacityPaxBounds(products) {
   }
   return void 0;
 }
+function pickFirstCustomCapacityDimensionId(products) {
+  for (const p of products) {
+    const cap = p == null ? void 0 : p.capacity;
+    if (!cap || cap.type !== "custom")
+      continue;
+    if (!Array.isArray(cap.custom) || cap.custom.length === 0)
+      continue;
+    const row = cap.custom[0];
+    if (!row || typeof row !== "object")
+      continue;
+    const id = row.id;
+    if (id === null || id === void 0 || id === "")
+      continue;
+    if (typeof id === "number" && Number.isFinite(id))
+      return id;
+    if (typeof id === "string") {
+      const trimmed = id.trim();
+      if (!trimmed)
+        continue;
+      return trimmed;
+    }
+  }
+  return void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   aggregateItemRuleLimit,
   attachItemRuleLimitsToTopLevelProducts,
   buildItemRuleBusinessData,
   buildProductKey,
+  buildProductLineFingerprint,
   buildQuantityLimitIndex,
+  buildSyntheticSingleOptionIdentityKey,
   collectLinkProductIdsFromReservationRules,
   computeResourceIsFull,
   createEmptySummary,
@@ -491,9 +611,11 @@ function pickFirstCustomCapacityPaxBounds(products) {
   getTopLevelVariantId,
   hasCustomCapacityProduct,
   isIdentityMatch,
+  isSkuOnlyDeleteIdentity,
   normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies,
   normalizeOrderProduct,
+  pickFirstCustomCapacityDimensionId,
   pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.508",
+  "version": "0.0.510",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",