@pisell/pisellos 0.0.507 → 0.0.509

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

@@ -235,3 +235,9 @@ export interface ScanOrderLoggerRuntimeConfig {
 }
 export interface ScanOrderAddLogParams extends ScanOrderLogInput {
 }
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+export interface ScanOrderScanCodeResult {
+    isAvailable: boolean;
+    type?: 'server' | string;
+    unavailableReason?: 'time_limit' | string;
+}

package/dist/solution/ScanOrder/types.js

@@ -17,4 +17,6 @@ export var ScanOrderHooks = /*#__PURE__*/function (ScanOrderHooks) {
 
 /** `resource_capacity[i].capacity_list[j]` */
 
-/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+/** `/order/resource/occupy-detail` 单条 `occupy_details[i]` */
+
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */

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/modules/Order/index.d.ts

@@ -86,7 +86,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

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/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -1,6 +1,7 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from './types';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 export * from './types';
@@ -29,6 +30,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private itemRuleRuntimeConfig;
     /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
     private enabledReservationRuleProducts;
+    private loginEffectDisposers;
+    private customerLoginRefreshInFlight;
+    private customerLoginRefreshIdInFlight;
+    private static readonly PISELL1_LOGIN_SUCCESS;
     private getScanOrderLoggerContext;
     private serializeError;
     private addScanOrderLog;
@@ -36,6 +41,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private logMethodSuccess;
     private logMethodError;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
+    private normalizeCustomerId;
+    private resolveCustomerIdFromLoginPayload;
+    private clearLoginEffectListeners;
+    private registerLoginEffect;
+    private registerCustomerLoginListeners;
+    private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
@@ -62,6 +73,15 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    getDiscountList(): Discount[];
+    scanCode(code: string, customerId?: number): Promise<ScanOrderScanCodeResult>;
+    setDiscountSelected(params: {
+        discountId: number;
+        isSelected: boolean;
+    }): Promise<void>;
+    onCustomerLogin(params: {
+        customerId: number;
+    }): Promise<void>;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/lib/solution/ScanOrder/index.js

@@ -35,8 +35,12 @@ __export(ScanOrder_exports, {
 module.exports = __toCommonJS(ScanOrder_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
+var import_Order = require("../../modules/Order");
+var import_types2 = require("../../modules/Account/types");
+var import_types3 = require("../RegisterAndLogin/types");
+var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("./utils");
-var import_types2 = require("../BookingByStep/types");
+var import_types4 = require("../BookingByStep/types");
 var import_ProductList = require("../../modules/ProductList");
 var import_Schedule = require("../../modules/Schedule");
 var import_getDateIsInSchedule = require("../../modules/Schedule/getDateIsInSchedule");
@@ -74,6 +78,9 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     this.itemRuleRuntimeConfig = {};
     /** 最近一次 checkResourceAvailable 从预约规则 link 拉取的商品快照 */
     this.enabledReservationRuleProducts = [];
+    this.loginEffectDisposers = [];
+    this.customerLoginRefreshInFlight = null;
+    this.customerLoginRefreshIdInFlight = null;
   }
   getScanOrderLoggerContext() {
     return {
@@ -157,6 +164,102 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  normalizeCustomerId(value) {
+    const customerId = Number(value);
+    if (!Number.isFinite(customerId) || customerId <= 0)
+      return null;
+    return customerId;
+  }
+  resolveCustomerIdFromLoginPayload(payload) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const candidates = [
+      payload == null ? void 0 : payload.customerId,
+      payload == null ? void 0 : payload.customer_id,
+      payload == null ? void 0 : payload.id,
+      (_a = payload == null ? void 0 : payload.user) == null ? void 0 : _a.customerId,
+      (_b = payload == null ? void 0 : payload.user) == null ? void 0 : _b.customer_id,
+      (_c = payload == null ? void 0 : payload.user) == null ? void 0 : _c.id,
+      (_e = (_d = payload == null ? void 0 : payload.user) == null ? void 0 : _d._origin) == null ? void 0 : _e.customer_id,
+      (_f = payload == null ? void 0 : payload.account) == null ? void 0 : _f.customerId,
+      (_g = payload == null ? void 0 : payload.account) == null ? void 0 : _g.customer_id,
+      (_h = payload == null ? void 0 : payload.account) == null ? void 0 : _h.id,
+      (_i = payload == null ? void 0 : payload._origin) == null ? void 0 : _i.customer_id
+    ];
+    for (const candidate of candidates) {
+      const customerId = this.normalizeCustomerId(candidate);
+      if (customerId)
+        return customerId;
+    }
+    return null;
+  }
+  clearLoginEffectListeners() {
+    for (const dispose of this.loginEffectDisposers) {
+      dispose();
+    }
+    this.loginEffectDisposers = [];
+  }
+  registerLoginEffect(event, callback) {
+    var _a;
+    const effects = (_a = this.core) == null ? void 0 : _a.effects;
+    if (!(effects == null ? void 0 : effects.on))
+      return;
+    effects.on(event, callback);
+    this.loginEffectDisposers.push(() => {
+      if (typeof effects.off === "function") {
+        effects.off(event, callback);
+      }
+    });
+  }
+  registerCustomerLoginListeners() {
+    this.clearLoginEffectListeners();
+    const createHandleLogin = () => async (payload) => {
+      const customerId = this.resolveCustomerIdFromLoginPayload(payload);
+      if (!customerId)
+        return;
+      await this.refreshOrderMarketingAfterLogin({ customerId });
+    };
+    this.registerLoginEffect(
+      _ScanOrderImpl.PISELL1_LOGIN_SUCCESS,
+      createHandleLogin()
+    );
+    this.registerLoginEffect(import_types2.AccountHooks.OnLogin, createHandleLogin());
+    this.registerLoginEffect(
+      import_types3.RegisterAndLoginHooks.onLoginSuccess,
+      createHandleLogin()
+    );
+  }
+  async refreshOrderMarketingAfterLogin(params) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    if (this.customerLoginRefreshInFlight) {
+      if (this.customerLoginRefreshIdInFlight === params.customerId) {
+        await this.customerLoginRefreshInFlight;
+        return;
+      }
+      await this.customerLoginRefreshInFlight;
+    }
+    this.customerLoginRefreshIdInFlight = params.customerId;
+    const refreshTask = (async () => {
+      await this.store.order.loadDiscountConfig({
+        customerId: params.customerId
+      });
+      await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      await this.refreshItemRuleQuantityLimits();
+      await this.refreshCartValidationPassed();
+    })();
+    this.customerLoginRefreshInFlight = refreshTask;
+    try {
+      await refreshTask;
+    } catch (error) {
+      throw error;
+    } finally {
+      if (this.customerLoginRefreshInFlight === refreshTask) {
+        this.customerLoginRefreshInFlight = null;
+        this.customerLoginRefreshIdInFlight = null;
+      }
+    }
+  }
   async initialize(core, options = {}) {
     var _a, _b, _c, _d, _e, _f;
     this.logMethodStart("initialize");
@@ -195,7 +298,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     ];
     moduleArr.forEach((step) => {
       var _a2, _b2, _c2, _d2, _e2, _f2;
-      const targetModule = (0, import_types2.createModule)(step, this.name);
+      const targetModule = (0, import_types4.createModule)(step, this.name);
       if (targetModule) {
         this.store[step] = targetModule;
         const initialState = step === "salesSummary" ? {
@@ -236,6 +339,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         fatherModule: this.name
       }
     });
+    this.registerCustomerLoginListeners();
     console.log("[ScanOrder] 初始化开始");
     try {
       await ((_e = this.store.order) == null ? void 0 : _e.recalculateSummary({ createIfMissing: false }));
@@ -269,6 +373,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   async destroy() {
     this.logMethodStart("destroy");
+    this.clearLoginEffectListeners();
     await this.core.effects.emit(import_types.ScanOrderHooks.onDestroy, {});
     console.log("[ScanOrder] 已销毁");
     this.logMethodSuccess("destroy");
@@ -494,6 +599,127 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getDiscountList() {
+    if (!this.store.order)
+      return [];
+    return this.store.order.getDiscountList();
+  }
+  async scanCode(code, customerId) {
+    this.logMethodStart("scanCode", { code });
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const raw = await this.store.order.scanCode(code, customerId);
+      if (raw.isAvailable) {
+        await this.store.order.recalculateSummary({ createIfMissing: true });
+        this.store.order.persistTempOrder();
+      }
+      this.logMethodSuccess("scanCode", { isAvailable: raw.isAvailable });
+      return {
+        isAvailable: raw.isAvailable,
+        type: raw.type,
+        unavailableReason: raw.unavailableReason
+      };
+    } catch (error) {
+      this.logMethodError("scanCode", error);
+      throw error;
+    }
+  }
+  async setDiscountSelected(params) {
+    var _a, _b, _c;
+    this.logMethodStart("setDiscountSelected", params);
+    try {
+      if (!this.store.order)
+        throw new Error("order 模块未初始化");
+      const list = this.store.order.getDiscountList();
+      const updated = list.map(
+        (d) => d.id === params.discountId ? {
+          ...d,
+          isSelected: params.isSelected,
+          isManualSelect: !params.isSelected
+        } : d
+      );
+      const tempOrder = this.store.order.ensureTempOrder();
+      const orderStore = this.store.order.store || {};
+      const discountModule = orderStore.discount;
+      const rulesModule = orderStore.rules;
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      let nextDiscountList = updated;
+      await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
+      if (rulesModule) {
+        const result = rulesModule.calcDiscount(
+          {
+            productList: tempOrder.products,
+            discountList: updated,
+            holders,
+            isFormSubject: !!((_b = tempOrder.holder) == null ? void 0 : _b.type) && tempOrder.holder.type === "form"
+          },
+          {
+            discountId: params.discountId,
+            isSelected: params.isSelected
+          }
+        ) || { productList: tempOrder.products, discountList: updated };
+        if (result == null ? void 0 : result.productList) {
+          tempOrder.products = result.productList;
+        }
+        if (result == null ? void 0 : result.discountList) {
+          nextDiscountList = result.discountList;
+          if (!params.isSelected) {
+            const beforeSelectedIds = new Set(
+              updated.filter((d) => d.isSelected).map((d) => d.id)
+            );
+            for (const d of nextDiscountList) {
+              if (d.isSelected && !beforeSelectedIds.has(d.id)) {
+                d.isSelected = false;
+              }
+            }
+          }
+        }
+      }
+      const selectedResourceIds = new Set(
+        nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
+      );
+      for (const product of tempOrder.products) {
+        if ((_c = product._origin) == null ? void 0 : _c.isManualDiscount)
+          continue;
+        product.discount_list = (product.discount_list || []).filter((pd) => {
+          var _a2;
+          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+          return rid != null && selectedResourceIds.has(rid);
+        });
+        const totalPerUnitDiscount = (product.discount_list || []).reduce(
+          (sum, pd) => sum + (pd.amount || 0),
+          0
+        );
+        const newSellingPrice = new import_decimal.default(product.original_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+        product.selling_price = newSellingPrice;
+        if (product.metadata) {
+          product.metadata.main_product_selling_price = newSellingPrice;
+        }
+      }
+      import_Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
+      await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
+      tempOrder.discount_list = (nextDiscountList || []).filter((d) => d.isSelected);
+      await this.store.order.recalculateSummary({ createIfMissing: true });
+      this.store.order.persistTempOrder();
+      this.logMethodSuccess("setDiscountSelected", params);
+    } catch (error) {
+      this.logMethodError("setDiscountSelected", error);
+      throw error;
+    }
+  }
+  async onCustomerLogin(params) {
+    this.logMethodStart("onCustomerLogin", { customerId: params.customerId });
+    try {
+      await this.refreshOrderMarketingAfterLogin({
+        customerId: params.customerId
+      });
+      this.logMethodSuccess("onCustomerLogin", { customerId: params.customerId });
+    } catch (error) {
+      this.logMethodError("onCustomerLogin", error);
+      throw error;
+    }
+  }
   // ScanOrder 提交 payload enhancer：
   // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
   // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
@@ -515,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)) {
@@ -536,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"
@@ -1035,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)({
@@ -1394,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 {
@@ -1407,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);
     }
@@ -1441,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);
     }
@@ -1499,11 +1736,19 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
 };
 var ScanOrderImpl = _ScanOrderImpl;
-// ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
+ScanOrderImpl.PISELL1_LOGIN_SUCCESS = "pisell1.login.success";
+// ─── 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

@@ -235,3 +235,9 @@ export interface ScanOrderLoggerRuntimeConfig {
 }
 export interface ScanOrderAddLogParams extends ScanOrderLogInput {
 }
+/** ScanOrder.scanCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
+export interface ScanOrderScanCodeResult {
+    isAvailable: boolean;
+    type?: 'server' | string;
+    unavailableReason?: 'time_limit' | string;
+}

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.507",
+  "version": "0.0.509",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",