@pisell/pisellos 2.3.66 → 2.3.68

package/lib/modules/Order/utils.js

@@ -1206,7 +1206,6 @@ function productRequiresFormSubject(tempOrder, product) {
 }
 function resolveIsFormSubject(tempOrder, product) {
   var _a;
-  debugger;
   if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
     return true;
   if (product)

package/lib/modules/Payment/index.d.ts

@@ -41,6 +41,10 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * paymentModule.updateOtherParams({ fatherModule: 'bookingTicket' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    /**
+     * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+     */
+    getPlatform(): string;
     private getPaymentNumberAppData;
     /**
      * 记录信息日志

package/lib/modules/Payment/index.js

@@ -139,6 +139,13 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   updateOtherParams(params) {
     this.otherParams = params || {};
   }
+  /**
+   * 获取标准化后的宿主平台标识，供支付子能力做平台边界判断。
+   */
+  getPlatform() {
+    var _a;
+    return String(((_a = this.otherParams) == null ? void 0 : _a.platform) || "").trim().toLowerCase();
+  }
   getPaymentNumberAppData(key) {
     var _a, _b, _c, _d, _e, _f, _g;
     const getData = (_b = (_a = this.appPlugin) == null ? void 0 : _a.getData) == null ? void 0 : _b.call(_a);

package/lib/modules/Payment/walletpass.js

@@ -722,6 +722,18 @@ var WalletPassPaymentImpl = class {
         this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
         return [];
       }
+      const platform = this.paymentModule.getPlatform();
+      if (platform === "pc" || platform === "h5") {
+        this.userIdentificationCodes = [];
+        this.emitEvent(import_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
+          userIdentificationCodes: []
+        });
+        this.paymentModule.logInfo(
+          "[WalletPass] 用户端平台跳过获取用户识别码列表",
+          { platform }
+        );
+        return [];
+      }
       if (typeof newParams.payment_order_id === "string" && newParams.payment_order_id.startsWith("LOCAL_")) {
         newParams.payment_order_id = void 0;
       }

package/lib/modules/Rules/index.js

@@ -865,10 +865,26 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
       }) : void 0;
       const explicitlySelectedDiscountCard = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) !== "good_pass" ? explicitlySelectedDiscount : void 0;
+      const appliedDiscountCardIds = new Set(
+        (product.discount_list || []).filter(
+          (item) => ["discount_card", "product_discount_card"].includes(
+            (item == null ? void 0 : item.tag) || (item == null ? void 0 : item.type)
+          )
+        ).map(
+          (item) => {
+            var _a3;
+            return ((_a3 = item == null ? void 0 : item.discount) == null ? void 0 : _a3.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.id);
+          }
+        ).filter((id) => id !== void 0 && id !== null).map(String)
+      );
+      const appliedDiscountCard = (options == null ? void 0 : options.scan) ? void 0 : applicableDiscounts.find((discount) => {
+        const discountType = discount.tag || discount.type;
+        return discount.isSelected === true && ["discount_card", "product_discount_card"].includes(discountType) && appliedDiscountCardIds.has(String(discount.id));
+      });
       const scannedSelectedDiscountCard = applicableDiscounts.find(
         (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
       );
-      const selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
+      const selectedDiscountCard = explicitlySelectedDiscountCard || appliedDiscountCard || scannedSelectedDiscountCard;
       const selectedDiscount = explicitlySelectedDiscount || selectedDiscountCard || applicableDiscounts[0];
       const prioritizedApplicableDiscounts = explicitlySelectedDiscount && (explicitlySelectedDiscount.tag || explicitlySelectedDiscount.type) === "good_pass" ? [
         explicitlySelectedDiscount,

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

@@ -141,7 +141,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * const params = this.buildSubModuleOtherParams();
      * this.core.registerModule(orderModule, { otherParams: params });
      */
-    protected buildSubModuleOtherParams(): Record<string, any>;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(_moduleName?: string): boolean;
+    protected buildSubModuleOtherParams(moduleName?: string): Record<string, any>;
     /**
      * 将父级 otherParams 的变更显式同步给已注册的子模块。
      *

package/lib/solution/BaseSales/index.js

@@ -591,7 +591,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
+  async hydrateLatestLoadedSalesDetail(record, loadSequence, hydrateSource) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
     const hydrateTask = async () => {
@@ -601,9 +601,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
+      const sales = await this.store.order.hydrateTempOrderFromRecord(
+        record,
+        hydrateSource === "sessionStorage" ? { recalcOnHydrate: true, source: "sessionStorage" } : { recalcOnHydrate: false }
+      );
       hydratedSales = sales;
       if (loadSequence !== this.salesDetailLoadSequence)
         return;
@@ -927,12 +928,18 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * const params = this.buildSubModuleOtherParams();
    * this.core.registerModule(orderModule, { otherParams: params });
    */
-  buildSubModuleOtherParams() {
+  isSessionStoragePersistEnabled() {
+    return Boolean(this.cacheId);
+  }
+  shouldUseSessionStorageForSubModule(_moduleName) {
+    return this.isSessionStoragePersistEnabled();
+  }
+  buildSubModuleOtherParams(moduleName) {
     return {
       ...this.otherParams,
       salesSummaryModuleName: `${this.name}_salesSummary`,
       fatherModule: this.name,
-      openCache: this.cacheId ? true : false,
+      openCache: this.shouldUseSessionStorageForSubModule(moduleName),
       cacheId: this.cacheId
     };
   }
@@ -943,7 +950,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * await this.syncOtherParamsToSubModules({ channel: 'pos' });
    */
   async syncOtherParamsToSubModules(changedParams, { cover = false } = {}) {
-    const nextSubModuleOtherParams = this.buildSubModuleOtherParams();
     await Promise.all(
       Object.entries(this.store).map(async ([moduleName, subModule]) => {
         if (this.reusedSharedSubModuleNames.has(moduleName)) {
@@ -953,6 +959,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         if (!targetModule || typeof targetModule.updateOtherParams !== "function") {
           return;
         }
+        const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
         await targetModule.updateOtherParams(nextSubModuleOtherParams, {
           changedParams,
           cover
@@ -965,14 +972,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * sessionStorage 损坏时静默忽略，按空状态注册。
    */
   readSessionCacheData() {
-    if (!this.cacheId || !this.window)
+    const cacheId = this.cacheId;
+    if (!cacheId || !this.isSessionStoragePersistEnabled() || !this.window) {
       return {};
+    }
     try {
       const sessionData = this.window.sessionStorage.getItem(this.name);
       if (!sessionData)
         return {};
       const data = JSON.parse(sessionData);
-      return data && data[this.cacheId] || {};
+      return data && data[cacheId] || {};
     } catch {
       return {};
     }
@@ -1074,9 +1083,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const hooks = this.getSubModuleHooks(step);
       this.store[step] = targetModule;
       this.core.registerModule(targetModule, {
-        initialState: (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {},
+        initialState: this.shouldUseSessionStorageForSubModule(step) ? (targetCacheData == null ? void 0 : targetCacheData[targetModule.name]) || {} : {},
         ...hooks ? { hooks } : {},
-        otherParams: this.buildSubModuleOtherParams()
+        otherParams: this.buildSubModuleOtherParams(step)
       });
     });
     if (this.store.schedule && !this.isScheduleListLoaded(this.store.schedule)) {
@@ -1143,17 +1152,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
         throw new Error(message);
       }
-      const remoteRecord = filterPendingPaymentsFromLoadedSalesDetail(
-        preloadedSalesDetail ?? loadedRecord.data
-      );
+      const loadedSalesDetail = preloadedSalesDetail ?? loadedRecord.data;
+      const shouldFilterPendingPayments = params.hydrateSource !== "sessionStorage";
+      const remoteRecord = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(loadedSalesDetail) : loadedSalesDetail;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
       const mergedRecord = params.merge ? mergeSalesDetailRecordWithTempOrder(
         currentTempOrder,
         remoteRecord,
         "preserve-local"
       ) : remoteRecord;
-      const record = filterPendingPaymentsFromLoadedSalesDetail(mergedRecord);
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+      const record = shouldFilterPendingPayments ? filterPendingPaymentsFromLoadedSalesDetail(mergedRecord) : mergedRecord;
+      return await this.hydrateLatestLoadedSalesDetail(
+        record,
+        loadSequence,
+        params.hydrateSource
+      );
     } finally {
       this.salesDetailLoadInFlightCount = Math.max(
         0,

package/lib/solution/BaseSales/utils.js

@@ -60,33 +60,44 @@ function createEmptySummary() {
   };
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_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.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_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.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   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
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).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;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

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

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

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

package/lib/solution/BookingTicket/index.js

@@ -56,6 +56,7 @@ var import_utils = require("../../modules/Order/utils");
 __reExport(BookingTicket_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
+var USER_PLATFORM = ["pc", "h5"];
 function resolveBookingUidForAddTime(booking) {
   var _a;
   const uid = (_a = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a.unique_identification_number;
@@ -135,6 +136,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.addTimeProductsCatalog = [];
     this.orderCustomerDiscountRefreshInFlight = null;
     this.orderCustomerDiscountRefreshCustomerId = null;
+    this.orderCustomerPromotionRefreshInFlight = null;
     this.loadOpenDataConfigInFlight = null;
   }
   /**
@@ -240,6 +242,11 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   async configureIdGeneratorFromOpenData() {
     this.setPaymentNumberDevicePrefix(null);
+    const idGenerator = this.getIdGeneratorPlugin();
+    if (!(idGenerator == null ? void 0 : idGenerator.configure)) {
+      console.warn("[BookingTicket] idGenerator 插件不可用，跳过配置");
+      return;
+    }
     let openDataConfig = null;
     try {
       openDataConfig = await this.loadOpenDataConfig();
@@ -247,11 +254,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       console.warn("[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置", error);
       return;
     }
-    const idGenerator = this.getIdGeneratorPlugin();
-    if (!(idGenerator == null ? void 0 : idGenerator.configure)) {
-      console.warn("[BookingTicket] idGenerator 插件不可用，跳过配置");
-      return;
-    }
     const receiptSequenceLength = this.normalizePositiveInteger(
       openDataConfig == null ? void 0 : openDataConfig["sale.short_number_digits"],
       5
@@ -352,7 +354,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const scannedList = raw.scannedDiscountList || [];
     const extractedCustomerId = this.getDiscountCustomerId(scannedList);
     const hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
-    if (!hasOrderCustomer && extractedCustomerId) {
+    const isUserPlatform = USER_PLATFORM.includes(this.otherParams.platform);
+    if (!hasOrderCustomer && extractedCustomerId && !isUserPlatform) {
       await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
     }
     if (raw.isAvailable) {
@@ -915,9 +918,21 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     const next = this.buildOrderCustomerPayload();
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
-    void this.store.order.applyPromotion().catch((error) => {
-      console.error("[BookingTicket] applyPromotion after customer change failed", error);
-    });
+    const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
+    this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;
+    void promotionRefreshTask.then(
+      () => {
+        if (this.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask)
+          return;
+        this.orderCustomerPromotionRefreshInFlight = null;
+      },
+      (error) => {
+        console.error("[BookingTicket] applyPromotion after customer change failed", error);
+        if (this.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask)
+          return;
+        this.orderCustomerPromotionRefreshInFlight = null;
+      }
+    );
   }
   /**
    * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
@@ -987,12 +1002,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   refreshDiscountConfigAfterOrderCustomerChange(customerId) {
     if (!customerId || customerId === 1)
-      return;
+      return Promise.resolve();
     if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
-      return;
+      return this.orderCustomerDiscountRefreshInFlight;
     }
     const previousRefresh = this.orderCustomerDiscountRefreshInFlight;
     const refreshTask = (async () => {
+      var _a, _b, _c, _d;
       if (previousRefresh) {
         await previousRefresh.catch(() => void 0);
       }
@@ -1000,7 +1016,10 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       if (!currentCustomer || Number(currentCustomer.customer_id) !== customerId) {
         return;
       }
-      await this.loadDiscountConfig({ customerId });
+      const tempOrder = (_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a);
+      const orderId = (tempOrder == null ? void 0 : tempOrder.order_id) || ((_d = (_c = this.getOrderIdentity) == null ? void 0 : _c.call(this)) == null ? void 0 : _d.orderId);
+      const action = !orderId || String(orderId).startsWith("local_order") ? "create" : "edit";
+      await this.loadDiscountConfig({ customerId, action });
     })();
     this.orderCustomerDiscountRefreshInFlight = refreshTask;
     this.orderCustomerDiscountRefreshCustomerId = customerId;
@@ -1012,6 +1031,10 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       this.orderCustomerDiscountRefreshInFlight = null;
       this.orderCustomerDiscountRefreshCustomerId = null;
     });
+    return refreshTask;
+  }
+  waitForOrderCustomerPromotionRefresh() {
+    return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
   }
   /**
    * 获取客户分页信息

package/lib/solution/ScanOrder/utils.js

@@ -357,33 +357,44 @@ function attachItemRuleLimitsToTopLevelProducts(productList, limits) {
   return productList;
 }
 function buildProductLineFingerprint(productOptionItem, productBundle) {
-  const optArr = Array.isArray(productOptionItem) ? productOptionItem : [];
-  const normalizedOpts = optArr.map((item) => ({
-    option_group_item_id: Number(item == null ? void 0 : item.option_group_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.add_price) ?? (item == null ? void 0 : item.price) ?? "")
-  })).sort((p, q) => {
-    if (p.option_group_item_id !== q.option_group_item_id) {
-      return p.option_group_item_id - q.option_group_item_id;
-    }
-    if (p.option_group_id !== q.option_group_id)
-      return p.option_group_id - q.option_group_id;
-    if (p.num !== q.num)
-      return p.num - q.num;
-    return p.price.localeCompare(q.price);
-  });
+  const normalizeOptions = (options) => {
+    const optionArr = Array.isArray(options) ? options : [];
+    return optionArr.map((item) => ({
+      option_group_item_id: Number(item == null ? void 0 : item.option_group_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.add_price) ?? (item == null ? void 0 : item.price) ?? "")
+    })).sort((p, q) => {
+      if (p.option_group_item_id !== q.option_group_item_id) {
+        return p.option_group_item_id - q.option_group_item_id;
+      }
+      if (p.option_group_id !== q.option_group_id) {
+        return p.option_group_id - q.option_group_id;
+      }
+      if (p.num !== q.num)
+        return p.num - q.num;
+      return p.price.localeCompare(q.price);
+    });
+  };
+  const normalizedOpts = normalizeOptions(productOptionItem);
   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
+    product_variant_id: Number((item == null ? void 0 : item.bundle_variant_id) ?? (item == null ? void 0 : item.product_variant_id)) || 0,
+    num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
+    option: normalizeOptions(item == null ? void 0 : item.option)
   })).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;
+    if (p.product_variant_id !== q.product_variant_id) {
+      return p.product_variant_id - q.product_variant_id;
+    }
+    if (p.num !== q.num)
+      return p.num - q.num;
+    return JSON.stringify(p.option).localeCompare(JSON.stringify(q.option));
   });
   return JSON.stringify([normalizedOpts, normalizedBundles]);
 }

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

@@ -63,6 +63,24 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private openDataTarget;
     private loadOpenDataInFlight;
     private loadOpenDataInFlightTarget;
+    protected getSubmitOrderSalesChannel(): string;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(moduleName?: string): boolean;
+    /**
+     * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+     * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+     */
+    getSessionStateValue<T = unknown>(key: string): T | undefined;
+    /**
+     * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+     * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+     */
+    setSessionStateValue(key: string, value: unknown): void;
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+    clearSessionStorageOrderSnapshot(): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -72,6 +90,13 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected getDefaultCheckoutSmallTicketDataFlag(): number;
     protected getRegisteredModuleNames(): readonly string[];
     protected createSubModule(moduleName: string): Module | null;
+    addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    syncAuthenticatedOrderCustomer(): Promise<boolean>;
+    private isAuthenticatedCustomerUserPlatform;
+    private resolveDiscountOrderIdentity;
+    private resolveDiscountAction;
+    private resetCachedCustomerDiscountState;
+    private refreshLegacySessionCustomerDiscounts;
     /**
      * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
      * business/channel target so a reused solution instance cannot leak another entry's menus.