@pisell/pisellos 0.10.6 → 0.10.8

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,8 +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。
@@ -111,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

package/lib/solution/UnifiedBookingSales/index.js

@@ -49,6 +49,9 @@ var import_BookingTicket = require("../BookingTicket");
 __reExport(UnifiedBookingSales_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
 function pickLocalizedText(value) {
   if (!value)
     return void 0;
@@ -469,6 +472,11 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
     this.loadOpenDataInFlight = null;
     this.loadOpenDataInFlightTarget = null;
   }
+  getSubmitOrderSalesChannel() {
+    var _a;
+    const channel = String(((_a = this.otherParams) == null ? void 0 : _a.channel) ?? "").trim();
+    return channel || super.getSubmitOrderSalesChannel();
+  }
   isSessionStoragePersistEnabled() {
     var _a;
     return Boolean(
@@ -478,6 +486,51 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.BookingTicket {
   shouldUseSessionStorageForSubModule(moduleName) {
     return this.isSessionStoragePersistEnabled() && moduleName === "order";
   }
+  /**
+   * 读取与当前 cacheId 同分桶的 Solution 会话状态。
+   * 该状态独立于 otherParams，适合页面皮肤保存短生命周期 UI 状态。
+   */
+  getSessionStateValue(key) {
+    if (!key || !this.isSessionStoragePersistEnabled())
+      return void 0;
+    const cacheData = this.readSessionCacheData();
+    const solutionCache = cacheData == null ? void 0 : cacheData[this.name];
+    if (!isRecord(solutionCache) || !isRecord(solutionCache.sessionState)) {
+      return void 0;
+    }
+    return solutionCache.sessionState[key];
+  }
+  /**
+   * 写入与当前 cacheId 同分桶的 Solution 会话状态。
+   * value 为 undefined 时删除该 key；存储失败不阻断业务流程。
+   */
+  setSessionStateValue(key, value) {
+    if (!key || !this.isSessionStoragePersistEnabled())
+      return;
+    const cacheData = this.readSessionCacheData();
+    const solutionCache = cacheData == null ? void 0 : cacheData[this.name];
+    const currentSessionState = isRecord(solutionCache) && isRecord(solutionCache.sessionState) ? solutionCache.sessionState : {};
+    const nextSessionState = { ...currentSessionState };
+    if (value === void 0) {
+      delete nextSessionState[key];
+    } else {
+      nextSessionState[key] = value;
+    }
+    this.checkSaveCache({
+      cacheId: this.cacheId,
+      fatherModule: this.name,
+      store: { sessionState: nextSessionState },
+      cacheKey: ["sessionState"]
+    });
+  }
+  /**
+   * 清除当前 cacheId 的可恢复订单快照，同时保留 Solution UI sessionState。
+   * 用于支付跳转等终态场景，避免浏览器返回时恢复已提交订单。
+   */
+  clearSessionStorageOrderSnapshot() {
+    var _a, _b;
+    (_b = (_a = this.store.order) == null ? void 0 : _a.clearSessionStoragePersistedTempOrder) == null ? void 0 : _b.call(_a);
+  }
   /**
    * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
    * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
@@ -761,32 +814,33 @@ var UnifiedBookingSalesImpl = class extends import_BookingTicket.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() {
-    const tempOrder = this.getTempOrder();
-    const salesDetail = this.getSalesOrder();
-    const items = (tempOrder == null ? void 0 : tempOrder.products) || [];
-    const bookings = (salesDetail == null ? void 0 : salesDetail.bookings) || (tempOrder == null ? void 0 : tempOrder.bookings) || [];
-    return {
-      items,
-      bookings: bookings.map((booking) => {
-        const productUid = booking == null ? void 0 : booking.product_uid;
-        const product = productUid ? items.find((item) => {
-          var _a;
-          const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.unique_identification_number) || (item == null ? void 0 : item.unique_identification_number);
-          return String(uid || "") === String(productUid);
-        }) || null : null;
-        return {
-          ...booking,
-          _extend: {
-            ...(booking == null ? void 0 : booking._extend) || {},
-            product,
-            addTimeProduct: [],
-            canAddTime: false
-          }
-        };
-      })
-    };
-  }
+  // getCart(): BookingTicketCartView {
+  //   const tempOrder = this.getTempOrder();
+  //   const salesDetail = this.getSalesOrder();
+  //   const items = tempOrder?.products || [];
+  //   const bookings = salesDetail?.bookings || tempOrder?.bookings || [];
+  //   return {
+  //     items,
+  //     bookings: bookings.map((booking: any) => {
+  //       const productUid = booking?.product_uid;
+  //       const product = productUid
+  //         ? items.find((item: any) => {
+  //           const uid = item?.metadata?.unique_identification_number || item?.unique_identification_number;
+  //           return String(uid || '') === String(productUid);
+  //         }) || null
+  //         : null;
+  //       return {
+  //         ...booking,
+  //         _extend: {
+  //           ...(booking?._extend || {}),
+  //           product,
+  //           addTimeProduct: [],
+  //           canAddTime: false,
+  //         },
+  //       };
+  //     }),
+  //   };
+  // }
   /**
    * 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

package/package.json

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