@pisell/pisellos 2.1.120 → 2.1.122

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -131,8 +131,7 @@ export function buildVenueBookingEntry(params) {
     metadata: {
       unique_identification_number: bookingUuid,
       venue_booking: true,
-      resource_id: resourceId,
-      slot_count: group.slotCount
+      resource_id: resourceId
     }
   };
 }

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

@@ -18,6 +18,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
+    getLastFetchedAt(): number | null;
     checkAvailability(scheduleModule?: ScheduleModule): OpenDataAvailabilityResult;
     storeChange(): void;
 }

package/lib/modules/OpenData/index.js

@@ -87,6 +87,9 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   getOpenData() {
     return this.store.data;
   }
+  getLastFetchedAt() {
+    return this.store.lastFetchedAt ?? null;
+  }
   checkAvailability(scheduleModule) {
     var _a;
     const scheduleList = scheduleModule ? scheduleModule.getScheduleListByIds(

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

@@ -76,6 +76,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     submitTempOrder<T = any>(params?: {
         cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";

package/lib/modules/Order/index.js

@@ -130,10 +130,24 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   // ─── Discount: 子模块注册 ───
   registerDiscountModules(options) {
+    let targetCacheData = {};
+    if (this.cacheId && this.window) {
+      const sessionData = this.window.sessionStorage.getItem(this.name);
+      if (sessionData) {
+        try {
+          const data = JSON.parse(sessionData);
+          targetCacheData = (data == null ? void 0 : data[this.cacheId]) || {};
+        } catch {
+        }
+      }
+    }
     const discount = new import_Discount.DiscountModule(`${this.name}_discount`);
     this.core.registerModule(discount, {
+      initialState: targetCacheData == null ? void 0 : targetCacheData[discount.name],
       otherParams: {
-        fatherModule: this.name
+        fatherModule: this.name,
+        openCache: !!this.cacheId,
+        cacheId: this.cacheId
       }
     });
     this.store.discount = discount;
@@ -473,7 +487,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
-      cacheId: effectiveCacheId
+      cacheId: effectiveCacheId,
+      platform: params == null ? void 0 : params.platform,
+      businessCode: params == null ? void 0 : params.businessCode,
+      channel: params == null ? void 0 : params.channel,
+      type: params == null ? void 0 : params.type
     });
     let result;
     if (tempOrder.order_id) {

package/lib/modules/Order/types.d.ts

@@ -212,6 +212,10 @@ export interface OrderModuleAPI {
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;
+        platform?: string;
+        businessCode?: string;
+        channel?: string;
+        type?: string;
     }) => Promise<T>;
     loadDiscountConfig: (params: {
         customerId: number;

package/lib/modules/Order/utils.d.ts

@@ -25,6 +25,9 @@ export declare const getAllDiscountList: (cartItem: CartItem) => any;
 export declare function createUuidV4(): string;
 export declare function isTempOrder(data: any): data is ScanOrderTempOrder;
 export declare function formatDateTime(date: Date): string;
+export declare function normalizeSubmitBooking<T extends {
+    metadata?: Record<string, any>;
+}>(booking: T): T;
 export declare function createDefaultTempOrder(params: {
     now: string;
     summary?: ScanOrderSummary;
@@ -33,6 +36,10 @@ export declare function buildSubmitPayload(params: {
     tempOrder: ScanOrderTempOrder;
     cacheId?: string;
     now?: Date;
+    platform?: string;
+    businessCode?: string;
+    channel?: string;
+    type?: string;
 }): ScanOrderSubmitPayload;
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];

package/lib/modules/Order/utils.js

@@ -38,7 +38,8 @@ __export(utils_exports, {
   generateDuration: () => generateDuration,
   getAllDiscountList: () => getAllDiscountList,
   isTempOrder: () => isTempOrder,
-  mergeRelationForms: () => mergeRelationForms
+  mergeRelationForms: () => mergeRelationForms,
+  normalizeSubmitBooking: () => normalizeSubmitBooking
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -132,6 +133,23 @@ function normalizeSubmitProduct(product) {
     metadata: cleanMetadata
   };
 }
+var SUBMIT_BOOKING_METADATA_WHITELIST = [
+  "unique_identification_number",
+  "collect_pax"
+];
+function normalizeSubmitBooking(booking) {
+  const rawMetadata = booking.metadata || {};
+  const cleanMetadata = {};
+  for (const key of SUBMIT_BOOKING_METADATA_WHITELIST) {
+    if (rawMetadata[key] !== void 0) {
+      cleanMetadata[key] = rawMetadata[key];
+    }
+  }
+  return {
+    ...booking,
+    metadata: cleanMetadata
+  };
+}
 var DEFAULT_TABLE_OCCUPANCY_DURATION = 20;
 function resolveTableOccupancyDuration(tempOrder) {
   var _a, _b, _c, _d;
@@ -203,7 +221,15 @@ function createDefaultTempOrder(params) {
   };
 }
 function buildSubmitPayload(params) {
-  const { tempOrder, cacheId, now = /* @__PURE__ */ new Date() } = params;
+  const {
+    tempOrder,
+    cacheId,
+    now = /* @__PURE__ */ new Date(),
+    platform,
+    businessCode,
+    channel,
+    type
+  } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   const summary = tempOrder.summary || (0, import_utils.createEmptySummary)();
   const relationId = tempOrder.relation_id;
@@ -238,12 +264,12 @@ function buildSubmitPayload(params) {
   const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
   return {
     ...tempOrderRest,
-    platform: normalizeSubmitPlatform(tempOrder.platform),
+    platform: normalizeSubmitPlatform(platform ?? tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: tempOrder.type || "table-order",
-    business_code: tempOrder.business_code || "table-order",
+    type: type ?? tempOrder.type ?? "table-order",
+    business_code: businessCode ?? tempOrder.business_code ?? "table-order",
     sales_channel: tempOrder.sales_channel || "my_pisel",
-    order_sales_channel: tempOrder.order_sales_channel || "online_store",
+    order_sales_channel: channel ?? tempOrder.order_sales_channel ?? "online_store",
     status: tempOrder.status || "normal",
     payment_status: tempOrder.payment_status || "payment_processing",
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -255,7 +281,7 @@ function buildSubmitPayload(params) {
     surcharge_fee: summary.surcharge_fee || tempOrder.surcharge_fee || "0.00",
     note: tempOrder.note || "",
     schedule_date: scheduleDate,
-    bookings,
+    bookings: bookings.map((booking) => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
@@ -298,5 +324,6 @@ function formatV1Product(products) {
   generateDuration,
   getAllDiscountList,
   isTempOrder,
-  mergeRelationForms
+  mergeRelationForms,
+  normalizeSubmitBooking
 });

package/lib/modules/ProductList/index.js

@@ -61,7 +61,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule
   }) {
-    var _a, _b;
+    var _a, _b, _c;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -95,7 +95,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        application_code: ((_b = this.otherParams) == null ? void 0 : _b.channel) === "online_store" ? "online-store" : (_c = this.otherParams) == null ? void 0 : _c.channel,
         with_schedule,
         schedule_datetime,
         is_eject: 1

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

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

package/lib/solution/ScanOrder/index.js

@@ -410,7 +410,7 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async submitScanOrder() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     this.logMethodStart("submitScanOrder");
     try {
       await this.validateBeforeSubmitByItemRule();
@@ -418,11 +418,15 @@ var ScanOrderImpl = class extends import_BaseModule.BaseModule {
         throw new Error("scanOrder解决方案需要 order 模块支持");
       }
       const result = await this.store.order.submitTempOrder({
-        cacheId: this.cacheId
+        cacheId: this.cacheId,
+        platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
+        businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+        channel: (_c = this.otherParams) == null ? void 0 : _c.channel,
+        type: (_d = this.otherParams) == null ? void 0 : _d.type
       });
       const tempOrder = this.store.order.getTempOrder();
       this.logMethodSuccess("submitScanOrder", {
-        productCount: ((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length) || 0
+        productCount: ((_e = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _e.length) || 0
       });
       return result;
     } catch (error) {

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

@@ -34,6 +34,10 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loginEffectDisposers;
     private customerLoginRefreshInFlight;
     private customerLoginRefreshIdInFlight;
+    private loadAllProductsInFlight;
+    private productsLoaded;
+    private loadOpenDataConfigInFlight;
+    private static readonly OPEN_DATA_CACHE_TTL;
     private getLoggerContext;
     private serializeError;
     private addVenueBookingLog;
@@ -64,6 +68,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         venueProducts: ProductData[];
         addonProducts: ProductData[];
     }>;
+    private _doLoadAllProducts;
     loadVenueProducts(): Promise<ProductData[]>;
     loadAddonProducts(): Promise<ProductData[]>;
     getVenueProducts(): ProductData[];
@@ -154,5 +159,15 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private refreshCartValidationPassed;
     setItemRuleRuntimeConfig(config?: VenueBookingItemRuleRuntimeConfig): Promise<void>;
     getOtherParams(): Record<string, any>;
+    private static readonly UI_STATE_KEY_PREFIX;
+    private getUIStateBucketKey;
+    private readUIStateBucket;
+    private writeUIStateBucket;
+    setUIState(key: string, value: any): void;
+    getUIState<T = any>(key: string): T | undefined;
+    deleteUIState(key: string): void;
     checkOpenDataAvailability(): Promise<OpenDataAvailabilityResult>;
+    setOtherParams(params: Record<string, any>, { cover }?: {
+        cover?: boolean;
+    }): Promise<void>;
 }

package/lib/solution/VenueBooking/index.js

@@ -74,7 +74,7 @@ function cloneCustomDepositData(customDepositData) {
     deposit_policy_data: Array.isArray(customDepositData.deposit_policy_data) ? [...customDepositData.deposit_policy_data] : []
   };
 }
-var VenueBookingImpl = class extends import_BaseModule.BaseModule {
+var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "venueBooking";
@@ -105,6 +105,9 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.loginEffectDisposers = [];
     this.customerLoginRefreshInFlight = null;
     this.customerLoginRefreshIdInFlight = null;
+    this.loadAllProductsInFlight = null;
+    this.productsLoaded = false;
+    this.loadOpenDataConfigInFlight = null;
   }
   getLoggerContext() {
     return {
@@ -499,6 +502,14 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   }
   // ─── 场地商品 & 附加商品 ───
   async loadAllProducts() {
+    if (this.loadAllProductsInFlight)
+      return this.loadAllProductsInFlight;
+    this.loadAllProductsInFlight = this._doLoadAllProducts().finally(() => {
+      this.loadAllProductsInFlight = null;
+    });
+    return this.loadAllProductsInFlight;
+  }
+  async _doLoadAllProducts() {
     var _a, _b, _c;
     this.logMethodStart("loadAllProducts");
     try {
@@ -526,6 +537,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
       }
       this.store.addonProducts.addProduct(addonList);
       this.resourceProductMap = (0, import_resource.buildResourceProductMap)(venueList);
+      this.productsLoaded = true;
       this.logMethodSuccess("loadAllProducts", {
         total: list.length,
         venueCount: venueList.length,
@@ -1145,7 +1157,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async submitOrder() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     this.logMethodStart("submitOrder");
     try {
       await this.validateBeforeSubmitByItemRule();
@@ -1153,11 +1165,15 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         throw new Error("venueBooking解决方案需要 order 模块支持");
       }
       const result = await this.store.order.submitTempOrder({
-        cacheId: this.cacheId
+        cacheId: this.cacheId,
+        platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
+        businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+        channel: (_c = this.otherParams) == null ? void 0 : _c.channel,
+        type: (_d = this.otherParams) == null ? void 0 : _d.type
       });
       const tempOrder = this.store.order.getTempOrder();
       this.logMethodSuccess("submitOrder", {
-        productCount: ((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length) || 0
+        productCount: ((_e = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _e.length) || 0
       });
       return result;
     } catch (error) {
@@ -1241,6 +1257,12 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async getProductList() {
+    if (this.productsLoaded) {
+      return (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
+        this.getAddonProductsList(),
+        this.store.itemRuleQuantityLimits || []
+      );
+    }
     const result = await this.loadAllProducts();
     return (0, import_utils.attachItemRuleLimitsToTopLevelProducts)(
       result.addonProducts,
@@ -1251,13 +1273,25 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   async loadOpenDataConfig() {
     if (!this.store.openData)
       throw new Error("openData 模块未初始化");
-    const openDataConfig = await this.store.openData.fetchOpenData({
+    const lastFetchedAt = this.store.openData.getLastFetchedAt();
+    const cachedData = this.store.openData.getOpenData();
+    if (cachedData && lastFetchedAt && Date.now() - lastFetchedAt < _VenueBookingImpl.OPEN_DATA_CACHE_TTL) {
+      this.otherParams.openData = cachedData;
+      return cachedData;
+    }
+    if (this.loadOpenDataConfigInFlight)
+      return this.loadOpenDataConfigInFlight;
+    this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
       scope: "board",
       target: "venue_booking+online_store",
       section_code: [...OPEN_DATA_SECTION_CODES]
+    }).then((openDataConfig) => {
+      this.otherParams.openData = openDataConfig;
+      return openDataConfig;
+    }).finally(() => {
+      this.loadOpenDataConfigInFlight = null;
     });
-    this.otherParams.openData = openDataConfig;
-    return openDataConfig;
+    return this.loadOpenDataConfigInFlight;
   }
   async loadRuntimeConfigs() {
     await this.loadOpenDataConfig();
@@ -1530,6 +1564,53 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getOtherParams() {
     return this.otherParams;
   }
+  getUIStateBucketKey() {
+    if (!this.cacheId)
+      return null;
+    return `${_VenueBookingImpl.UI_STATE_KEY_PREFIX}${this.cacheId}`;
+  }
+  readUIStateBucket() {
+    var _a;
+    const key = this.getUIStateBucketKey();
+    if (!key || !((_a = this.window) == null ? void 0 : _a.sessionStorage))
+      return {};
+    try {
+      const raw = this.window.sessionStorage.getItem(key) || "{}";
+      const parsed = JSON.parse(raw);
+      return parsed && typeof parsed === "object" ? parsed : {};
+    } catch {
+      return {};
+    }
+  }
+  writeUIStateBucket(bucket) {
+    var _a;
+    const key = this.getUIStateBucketKey();
+    if (!key || !((_a = this.window) == null ? void 0 : _a.sessionStorage))
+      return;
+    this.window.sessionStorage.setItem(key, JSON.stringify(bucket));
+  }
+  setUIState(key, value) {
+    if (!this.getUIStateBucketKey())
+      return;
+    const bucket = this.readUIStateBucket();
+    bucket[key] = value;
+    this.writeUIStateBucket(bucket);
+  }
+  getUIState(key) {
+    if (!this.getUIStateBucketKey())
+      return void 0;
+    const bucket = this.readUIStateBucket();
+    return bucket[key];
+  }
+  deleteUIState(key) {
+    if (!this.getUIStateBucketKey())
+      return;
+    const bucket = this.readUIStateBucket();
+    if (key in bucket) {
+      delete bucket[key];
+      this.writeUIStateBucket(bucket);
+    }
+  }
   // ─── OpenData 可用性 ───
   async checkOpenDataAvailability() {
     if (!this.store.openData)
@@ -1537,7 +1618,22 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     await this.loadOpenDataConfig();
     return this.store.openData.checkAvailability(this.store.schedule);
   }
+  async setOtherParams(params, { cover = false } = {}) {
+    if (cover) {
+      this.otherParams = params;
+    } else {
+      this.otherParams = { ...this.otherParams, ...params };
+    }
+  }
 };
+var VenueBookingImpl = _VenueBookingImpl;
+VenueBookingImpl.OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
+// ─── UI 状态缓存（按 cacheId 分桶，sessionStorage） ───
+//
+// 用于物料层持久化 UI 层面的轻量状态（如当前步骤、登录回跳意图等）。
+// 桶键：pisell.venueBooking.uiState:<cacheId>；内部以 JSON object 形式存储多个字段。
+// 无 cacheId 时所有方法自动降级为 no-op，上层不用判空。
+VenueBookingImpl.UI_STATE_KEY_PREFIX = "pisell.venueBooking.uiState:";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   VenueBookingImpl,

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -142,8 +142,7 @@ function buildVenueBookingEntry(params) {
     metadata: {
       unique_identification_number: bookingUuid,
       venue_booking: true,
-      resource_id: resourceId,
-      slot_count: group.slotCount
+      resource_id: resourceId
     }
   };
 }

package/package.json

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