@pisell/pisellos 0.0.508 → 0.0.509

package/dist/modules/Order/index.js

@@ -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";
@@ -737,7 +737,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: {

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

@@ -390,6 +390,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/utils.d.ts

@@ -129,3 +129,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

@@ -580,4 +580,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

@@ -477,7 +477,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,
@@ -366,6 +367,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 +395,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/utils.d.ts

@@ -129,3 +129,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

@@ -47,6 +47,7 @@ __export(utils_exports, {
   normalizeEnabledItemRuleIds: () => normalizeEnabledItemRuleIds,
   normalizeItemRuleStrategies: () => normalizeItemRuleStrategies,
   normalizeOrderProduct: () => normalizeOrderProduct,
+  pickFirstCustomCapacityDimensionId: () => pickFirstCustomCapacityDimensionId,
   pickFirstCustomCapacityPaxBounds: () => pickFirstCustomCapacityPaxBounds,
   pickFirstDurationMinutesFromProducts: () => pickFirstDurationMinutesFromProducts,
   resolveSkuMatchedQuantityLimits: () => resolveSkuMatchedQuantityLimits,
@@ -474,6 +475,30 @@ 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,
@@ -494,6 +519,7 @@ function pickFirstCustomCapacityPaxBounds(products) {
   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.509",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",