@pisell/pisellos 2.1.120 → 2.1.121

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/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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.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;

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;

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;
@@ -255,7 +273,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 +316,6 @@ function formatV1Product(products) {
   generateDuration,
   getAllDiscountList,
   isTempOrder,
-  mergeRelationForms
+  mergeRelationForms,
+  normalizeSubmitBooking
 });

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/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[];

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 {
@@ -423,6 +426,7 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
         await this.store.schedule.loadAllSchedule();
         this.injectScheduleResolverToQuotation();
       }
+      this.loadQuotations();
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
       console.log("[VenueBooking] 初始化完成");
@@ -499,6 +503,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 +538,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,
@@ -1241,6 +1254,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 +1270,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();
@@ -1538,6 +1569,8 @@ var VenueBookingImpl = class extends import_BaseModule.BaseModule {
     return this.store.openData.checkAvailability(this.store.schedule);
   }
 };
+var VenueBookingImpl = _VenueBookingImpl;
+VenueBookingImpl.OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
 // 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.121",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",