@pisell/pisellos 0.10.7 → 0.10.8

package/lib/solution/BaseSales/index.js

@@ -73,8 +73,11 @@ function isRejectedSalesSubmitResult(result) {
   return candidates.some((candidate) => {
     if (!candidate || typeof candidate !== "object")
       return false;
-    const responseCode = Number(candidate.code ?? candidate.statusCode);
-    if (Number.isFinite(responseCode) && responseCode >= 400)
+    if (candidate.code !== void 0 && candidate.code !== 200 && candidate.code !== "200") {
+      return true;
+    }
+    const statusCode = Number(candidate.statusCode);
+    if (Number.isFinite(statusCode) && statusCode >= 400)
       return true;
     if (candidate.status === false || candidate.success === false || candidate.result === false) {
       return true;
@@ -84,9 +87,9 @@ function isRejectedSalesSubmitResult(result) {
     );
   });
 }
-function getSalesSubmitErrorMessage(result) {
+function getSalesSubmitErrorMessage(result, fallbackMessage) {
   var _a, _b;
-  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || "Wallet 支付确认失败";
+  return (result == null ? void 0 : result.message) || (result == null ? void 0 : result.msg) || ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.message) || ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.msg) || fallbackMessage;
 }
 function toWalletFundValue(value) {
   try {
@@ -703,6 +706,36 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return null;
     return productId;
   }
+  /**
+  * Change Time / customer reprice 必须沿用商品列表的渠道口径。
+  * SalesSdk Provider 通常将渠道存为 platform，因此不能只读取 otherParams.channel。
+  */
+  getPriceQueryChannel(channel) {
+    var _a, _b, _c;
+    const strategyContext = ((_a = this.otherParams) == null ? void 0 : _a.strategy_context) && typeof this.otherParams.strategy_context === "object" ? this.otherParams.strategy_context : {};
+    const value = channel ?? strategyContext.channel ?? ((_b = this.otherParams) == null ? void 0 : _b.channel) ?? ((_c = this.otherParams) == null ? void 0 : _c.platform);
+    if (value === void 0 || value === null || String(value).trim() === "") {
+      return void 0;
+    }
+    return String(value).trim();
+  }
+  /**
+   * /product/query 的智能定价评估只读取 strategy_context；
+   * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
+   */
+  getPriceQueryStrategyContext(channel) {
+    var _a, _b, _c;
+    const inherited = ((_a = this.otherParams) == null ? void 0 : _a.strategy_context) && typeof this.otherParams.strategy_context === "object" ? this.otherParams.strategy_context : {};
+    const strategyContext = { ...inherited };
+    const resolvedChannel = this.getPriceQueryChannel(channel);
+    const businessCode = strategyContext.business_code ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code);
+    if (resolvedChannel)
+      strategyContext.channel = resolvedChannel;
+    if (businessCode !== void 0 && businessCode !== null && String(businessCode).trim() !== "") {
+      strategyContext.business_code = String(businessCode).trim();
+    }
+    return strategyContext;
+  }
   getPriceQuerySchedule(params) {
     const booking = params.booking || {};
     if (typeof booking.start_date === "string" && booking.start_date.trim()) {
@@ -730,13 +763,15 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async loadProductsForPriceQuery(params) {
-    var _a, _b;
+    var _a;
     const ids = Array.from(new Set(
       params.ids.filter((id) => Number.isFinite(id))
     ));
     const productsById = /* @__PURE__ */ new Map();
     if (!ids.length || !this.request)
       return productsById;
+    const channel = this.getPriceQueryChannel(params.channel);
+    const strategyContext = this.getPriceQueryStrategyContext(channel);
     try {
       const response = await this.request.post("/product/query", {
         ids,
@@ -748,13 +783,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         customer_id: params.customerId,
         schedule_date: params.schedule.schedule_date,
         schedule_datetime: params.schedule.schedule_datetime,
-        application_code: params.channel || ((_a = this.otherParams) == null ? void 0 : _a.channel)
+        application_code: channel,
+        ...Object.keys(strategyContext).length ? { strategy_context: strategyContext } : {}
       }, {
         osServer: true,
         customToast: () => {
         }
       });
-      const list = ((_b = response == null ? void 0 : response.data) == null ? void 0 : _b.list) || (response == null ? void 0 : response.list) || [];
+      const list = ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.list) || (response == null ? void 0 : response.list) || [];
       if (!Array.isArray(list))
         return productsById;
       list.forEach((item) => {
@@ -1203,10 +1239,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const result = ((_a = this.store.order) == null ? void 0 : _a.getTempOrder()) || null;
     return result;
   }
-  async replaceTempOrder(tempOrder) {
+  async replaceTempOrder(tempOrder, options) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    const nextTempOrder = await this.store.order.replaceTempOrder(tempOrder);
+    const nextTempOrder = await this.store.order.replaceTempOrder(tempOrder, options);
     await this.effectsEmit("onTempOrderReplaced", { tempOrder: nextTempOrder });
     return nextTempOrder;
   }
@@ -2766,7 +2802,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         confirmPendingVoucherPayments: true
       });
       if (isRejectedSalesSubmitResult(submitResult)) {
-        throw new Error(getSalesSubmitErrorMessage(submitResult));
+        throw new Error(
+          getSalesSubmitErrorMessage(submitResult, "Wallet 支付确认失败")
+        );
       }
     } catch (error) {
       this.store.order.setOrderPayments(beforePayments);
@@ -2869,6 +2907,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(
@@ -2979,6 +3022,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         smallTicketDataFlag: 1,
         confirmPendingVoucherPayments: true
       });
+      if (isRejectedSalesSubmitResult(syncResult.submitResult)) {
+        throw new Error(
+          getSalesSubmitErrorMessage(syncResult.submitResult, "订单提交失败")
+        );
+      }
       if (this.store.payment) {
         const committed = this.getCommittedWalletAssets();
         const walletState = this.store.payment.wallet.setCommittedWalletAssets(
@@ -3200,11 +3248,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     });
   }
-  async addProductToOrder(product, booking) {
+  async addProductToOrder(product, booking, options) {
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      const products = await this.store.order.addProductToOrder(product, booking);
+      const products = await this.store.order.addProductToOrder(product, booking, options);
       return products;
     } catch (error) {
       throw error;
@@ -3280,17 +3328,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * @example
    * await baseSales.removeProductsFromOrder([identityA, identityB]);
    */
-  async removeProductsFromOrder(identities) {
+  async removeProductsFromOrder(identities, options) {
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      return await this.store.order.removeProductsFromOrder(identities);
+      return await this.store.order.removeProductsFromOrder(identities, options);
     } catch (error) {
       throw error;
     }
   }
-  async removeProductFromOrder(identity) {
-    return this.removeProductsFromOrder([identity]);
+  async removeProductFromOrder(identity, options) {
+    return this.removeProductsFromOrder([identity], options);
   }
   // ─── 促销/赠品 透传（迁移自 booking usePromotion） ────────────────
   /**

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -366,9 +366,33 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
+function hasGoodPassDiscount(product) {
+  var _a, _b;
+  const productBundle = Array.isArray(product == null ? void 0 : product.product_bundle) ? product.product_bundle : [];
+  const extendedBundle = Array.isArray((_b = (_a = product == null ? void 0 : product._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) ? product._extend.other.bundle : [];
+  const discountLists = [
+    product == null ? void 0 : product.discount_list,
+    ...productBundle.map((item) => item == null ? void 0 : item.discount_list),
+    ...extendedBundle.map((item) => item == null ? void 0 : item.discount_list)
+  ];
+  return discountLists.some(
+    (discountList) => Array.isArray(discountList) && discountList.some(
+      (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
+    )
+  );
+}
 function getPromotionLineMergeBoundary(product) {
-  var _a;
-  if (((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_edit_for_runtime) !== true)
+  var _a, _b;
+  if ((product == null ? void 0 : product.product_id) === void 0 || (product == null ? void 0 : product.product_id) === null) {
+    return `custom:${getOrderProductUid(product)}`;
+  }
+  if (hasGoodPassDiscount(product)) {
+    return `good-pass:${getOrderProductUid(product)}`;
+  }
+  if (Number(((_a = product == null ? void 0 : product.product_sku) == null ? void 0 : _a.open_sold_weight) || 0) === 1) {
+    return `weighing:${getOrderProductUid(product)}`;
+  }
+  if (((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_edit_for_runtime) !== true)
     return "";
   return `edit:${getOrderProductUid(product)}`;
 }

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -217,7 +217,7 @@ function transformBaseProductToOrderProduct(params) {
   }
   const productTitle = {
     ...(sourceProduct == null ? void 0 : sourceProduct.title_i18n) || {},
-    original: (sourceProduct == null ? void 0 : sourceProduct.title) || ""
+    original: (sourceProduct == null ? void 0 : sourceProduct.original_title) || (sourceProduct == null ? void 0 : sourceProduct.title) || ""
   };
   return {
     product_id: productId,

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 | 5 | 2 | 1 | 6 | 4 | 3;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -1599,10 +1599,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       });
     }
     if (typeof this.store.order.addProductsToOrder === "function") {
-      return this.store.order.addProductsToOrder(orderLines, {
-        skipEditDiscountConfigRefresh: true,
-        skipDiscountRecalculation: true
-      });
+      return this.store.order.addProductsToOrder(orderLines);
     }
     const result = [];
     for (const line of orderLines) {

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

@@ -118,12 +118,15 @@ export interface BookingTicketCartBookingView extends ISalesBooking {
         canAddTime: boolean;
     };
 }
+export type BookingTicketCartLineView = BookingTicketCartBookingView | BookingTicketCartItemView;
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
     bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
+    /** 以 tempOrder.products 为唯一顺序真源的统一购物车行（旧到新）。 */
+    lines: BookingTicketCartLineView[];
 }
 /**
  * BookingTicket 面向 UI 的客户展示视图。

package/lib/solution/BookingTicket/utils/cartView.js

@@ -86,29 +86,27 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
+  const childBookings = bookingList.filter((booking) => booking.parent_id !== 0);
+  const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  const claimedUids = /* @__PURE__ */ new Set();
   const claimedAddTimeLines = /* @__PURE__ */ new Set();
-  const cartBookings = bookingList.filter((booking) => booking.parent_id !== 0).reduce((acc, booking) => {
-    const uid = booking == null ? void 0 : booking.product_uid;
+  childBookings.forEach((booking) => {
+    const bookingUid = getBookingUid(booking);
+    if (!bookingUid)
+      return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach((line) => {
+      claimedAddTimeLines.add(line);
+    });
+  });
+  const claimedBookings = /* @__PURE__ */ new Set();
+  const cartBookings = [];
+  const items = [];
+  const orderedLines = [];
+  const buildBookingView = (booking, product) => {
     const bookingUid = getBookingUid(booking);
-    let product = null;
-    if (uid !== void 0 && uid !== null && uid !== "") {
-      const key = String(uid);
-      if (!claimedUids.has(key)) {
-        const line = linesByUid[key];
-        if (isGiftProductLine(line))
-          return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
     const addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach((line) => claimedAddTimeLines.add(line));
-    acc.push({
+    return {
       ...booking,
       _extend: {
         product,
@@ -122,21 +120,36 @@ function buildCartView(lines, bookings, options = {}) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    });
-    return acc;
-  }, []);
-  const items = productLines.filter((line) => {
+    };
+  };
+  productLines.forEach((line) => {
     var _a;
-    if (isGiftProductLine(line))
-      return false;
-    if (claimedAddTimeLines.has(line))
-      return false;
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line))
+      return;
     const uid = (_a = line.metadata) == null ? void 0 : _a.unique_identification_number;
-    if (uid === void 0 || uid === null || uid === "")
-      return true;
-    return !claimedUids.has(String(uid));
+    const matchedBooking = uid === void 0 || uid === null || uid === "" ? void 0 : (bookingsByProductUid[String(uid)] || []).find(
+      (booking) => !claimedBookings.has(booking)
+    );
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      const bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach((booking) => {
+    if (claimedBookings.has(booking))
+      return;
+    const uid = booking == null ? void 0 : booking.product_uid;
+    const linkedProduct = uid === void 0 || uid === null || uid === "" ? null : linesByUid[String(uid)] || null;
+    if (isGiftProductLine(linkedProduct))
+      return;
+    cartBookings.push(buildBookingView(booking, null));
   });
-  return { bookings: cartBookings, items };
+  return { bookings: cartBookings, items, lines: orderedLines };
 }
 function isWalkInCustomer(customer) {
   if (!customer)

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

@@ -95,6 +95,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
      * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
      * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
      * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+     * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
      */
     private pickBookingsForCurrentPoint;
     /**

package/lib/solution/Sales/index.js

@@ -316,8 +316,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    * 2) 若无 active，返回已超时且仍占用中的预约（允许并发多条）
    * 3) 若仍无，返回最近一组未来预约（同 start_time 的并发预约全部返回）
    * 4) 最后兜底返回一条（避免资源有历史预约时完全无反馈）
+   * - includeAllFuture 时，保留选中预约并返回当天全部后续预约；仅详情接口启用。
    */
-  pickBookingsForCurrentPoint(current, bookings) {
+  pickBookingsForCurrentPoint(current, bookings, options = {}) {
     if (bookings.length === 0)
       return [];
     const currentDayStart = current.startOf("day");
@@ -334,6 +335,13 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const appendNextStartGroupIfNeeded = (selectedBookings) => {
       if (selectedBookings.length === 0)
         return selectedBookings;
+      if (options.includeAllFuture) {
+        const allFutureBookings = dayScopedBookings.filter((booking) => {
+          const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+          return startAt.isValid() && startAt.isAfter(current);
+        });
+        return [...selectedBookings, ...allFutureBookings];
+      }
       const shouldAppendNextGroup = selectedBookings.some(
         (booking) => booking.status === "reserved" || booking.status === "occupied"
       );
@@ -384,6 +392,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, "day");
     });
     if (upcoming.length > 0) {
+      if (options.includeAllFuture)
+        return upcoming;
       const firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
       const upcomingStartGroup = upcoming.filter((booking) => {
         const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
@@ -638,7 +648,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const unpaidBookingList = matchedBookingList.filter((booking) => this.isUnpaidBooking(booking));
     const bookings = this.pickBookingsForCurrentPoint(
       current,
-      this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)
+      this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList),
+      { includeAllFuture: true }
     );
     const completedBookings = completedBookingList.map((booking) => {
       return {
@@ -654,7 +665,8 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     });
     const unpaidBookings = this.pickBookingsForCurrentPoint(
       current,
-      this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
+      this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList),
+      { includeAllFuture: true }
     );
     const orderCount = this.countBookingOrders(statsBookingList);
     const bookingCount = statsBookingList.length;

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

@@ -76,6 +76,11 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
      */
     setSessionStateValue(key: string, value: unknown): void;
+    /**
+     * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+     * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+     */
+    clearSessionStorageOrderSnapshot(): void;
     /**
      * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
      * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -122,10 +127,6 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      * Read-only compatibility view for salesSdk skins. It reconnects a booking to its product but
      * must not be used to mutate tempOrder; all writes go through BaseSales / planner APIs.
      */
-    getCart(): {
-        items: any[];
-        bookings: any[];
-    };
     /**
      * Loads the current customer's product coupons and discount cards after planner lines exist,
      * then optionally lets the existing Rules engine select the best valid combination. This is a