@pisell/pisellos 0.10.51 → 0.10.53

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

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

@@ -10,6 +10,10 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     private openCache;
     private fatherModule;
     private hasLoadedScheduleList;
+    private scheduleListPromise;
+    private scheduleListRequestVersion;
+    private scheduleCatalogScope;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -19,6 +23,9 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
      * scheduleModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' });
      */
     updateOtherParams(params: Record<string, any>): void;
+    private syncScheduleCatalogScope;
+    private resetScheduleCatalog;
+    destroy(): void;
     /**
      * 加载当前店铺下所有 schedule
      *
@@ -27,6 +34,7 @@ export declare class ScheduleModule extends BaseModule implements Module, Schedu
     loadAllSchedule(options?: {
         useCache?: boolean;
     }): Promise<void>;
+    private loadScheduleCatalog;
     setScheduleList(list: ScheduleItem[]): void;
     private syncScheduleMap;
     getScheduleList(): ScheduleItem[];

package/lib/modules/Schedule/index.js

@@ -24,10 +24,18 @@ class ScheduleModule extends _BaseModule.BaseModule {
   openCache = false;
   fatherModule;
   hasLoadedScheduleList = false;
+  scheduleListPromise = null;
+  scheduleListRequestVersion = 0;
+  scheduleCatalogScope = '';
+  otherParams = {};
   constructor(name, version) {
     super(name, version);
   }
   async initialize(core, options) {
+    // The store proxies initialState, so capture its input before resets write through it.
+    const initialScheduleList = options.initialState?.scheduleList;
+    const hasInitialScheduleList = Array.isArray(initialScheduleList);
+    this.resetScheduleCatalog();
     this.core = core;
 
     // 获取依赖的插件
@@ -40,24 +48,18 @@ class ScheduleModule extends _BaseModule.BaseModule {
     //   this.state = { ...this.state, ...options.initialState }
     // }
     this.store = options?.store;
+    this.updateOtherParams(options.otherParams || {});
     if (options.initialState) {
-      this.store.scheduleList = options.initialState.scheduleList;
+      this.store.scheduleList = hasInitialScheduleList ? initialScheduleList : [];
       this.syncScheduleMap();
       this.store.availabilityDateList = options.initialState.availabilityDateList;
-      this.hasLoadedScheduleList = Array.isArray(options.initialState.scheduleList);
+      this.hasLoadedScheduleList = hasInitialScheduleList;
     } else {
       this.store.scheduleList = [];
       this.store.map = new Map();
       this.store.availabilityDateList = [];
       this.hasLoadedScheduleList = false;
     }
-    if (options.otherParams?.cacheId) {
-      this.openCache = options.otherParams.openCache;
-      this.cacheId = options.otherParams.cacheId;
-    }
-    if (options.otherParams?.fatherModule) {
-      this.fatherModule = options.otherParams.fatherModule;
-    }
   }
 
   /**
@@ -68,9 +70,34 @@ class ScheduleModule extends _BaseModule.BaseModule {
    */
   updateOtherParams(params) {
     const otherParams = params || {};
+    this.otherParams = {
+      ...otherParams
+    };
     this.openCache = otherParams.openCache ?? false;
     this.cacheId = otherParams.cacheId;
     this.fatherModule = otherParams.fatherModule;
+    this.syncScheduleCatalogScope();
+  }
+  syncScheduleCatalogScope() {
+    const context = this.core?.context;
+    const shopId = typeof context?.getData === 'function' ? context.getData('shop_id') : context?.shop_id;
+    const params = this.otherParams;
+    const scope = JSON.stringify([this.cacheId, this.fatherModule, params.businessCode ?? params.business_code, params.channel, params.platform, params.businessTimezone, shopId].map(value => String(value ?? '').trim()));
+    if (scope !== this.scheduleCatalogScope) {
+      this.resetScheduleCatalog();
+      this.scheduleCatalogScope = scope;
+    }
+  }
+  resetScheduleCatalog() {
+    this.scheduleListRequestVersion += 1;
+    this.scheduleListPromise = null;
+    this.hasLoadedScheduleList = false;
+    this.store.scheduleList = [];
+    this.store.map = new Map();
+  }
+  destroy() {
+    this.resetScheduleCatalog();
+    super.destroy();
   }
 
   /**
@@ -79,14 +106,40 @@ class ScheduleModule extends _BaseModule.BaseModule {
    * @memberof ScheduleModule
    */
   async loadAllSchedule(options = {}) {
-    const scheduleList = await this.request.get(`/schedule`, {
+    this.syncScheduleCatalogScope();
+    const useCache = options.useCache ?? true;
+    if (useCache) {
+      if (this.scheduleListPromise) return this.scheduleListPromise;
+      if (this.hasLoadedScheduleList) return;
+    }
+    const requestVersion = ++this.scheduleListRequestVersion;
+    const promise = this.loadScheduleCatalog(useCache, requestVersion);
+    this.scheduleListPromise = promise;
+    try {
+      await promise;
+    } finally {
+      if (this.scheduleListPromise === promise) {
+        this.scheduleListPromise = null;
+      }
+    }
+  }
+  async loadScheduleCatalog(useCache, requestVersion) {
+    const response = await this.request.get(`/schedule`, {
       num: 999
     }, {
-      useCache: options.useCache ?? true
+      useCache
     });
-    this.setScheduleList(scheduleList.data?.list || []);
+    if (response.code !== undefined && Number(response.code) !== 200 || response.status === false || typeof response.status === 'number' && response.status >= 400 || response.success === false) {
+      throw new Error(response.message || 'Schedule catalog request failed');
+    }
+    this.syncScheduleCatalogScope();
+    // A refresh or a different runtime may have superseded this request.
+    if (requestVersion === this.scheduleListRequestVersion) {
+      this.setScheduleList(response.data?.list || []);
+    }
   }
   setScheduleList(list) {
+    this.syncScheduleCatalogScope();
     this.store.scheduleList = list;
     this.syncScheduleMap();
     this.hasLoadedScheduleList = true;
@@ -95,9 +148,11 @@ class ScheduleModule extends _BaseModule.BaseModule {
     this.store.map = new Map((this.store.scheduleList || []).map(schedule => [Number(schedule.id), schedule]));
   }
   getScheduleList() {
+    this.syncScheduleCatalogScope();
     return this.store.scheduleList || [];
   }
   isScheduleListLoaded() {
+    this.syncScheduleCatalogScope();
     return this.hasLoadedScheduleList;
   }
   async loadScheduleAvailableDate({
@@ -149,6 +204,7 @@ class ScheduleModule extends _BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
+    this.syncScheduleCatalogScope();
     const idSet = new Set(ids.map(id => String(id)));
     if (this.store.map instanceof Map && this.store.map.size > 0) {
       return ids.map(id => this.store.map.get(Number(id))).filter(Boolean);

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

@@ -160,6 +160,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected isPickupTimingEnabled(): boolean;
     protected getPickupTimingContextData(key: string): unknown;
     protected getPickupTimingScope(): string;
+    protected resetPickupTimingCache(): void;
     private getPickupTimingController;
     getPickupTimingAvailability(params?: {
         date?: string;

package/lib/solution/BaseSales/index.js

@@ -1172,6 +1172,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       cacheId: this.cacheId
     });
   }
+  resetPickupTimingCache() {
+    this.pickupTimingController?.invalidate();
+  }
   getPickupTimingController() {
     if (!this.pickupTimingController) {
       this.pickupTimingController = new _pickupTiming2.PickupTimingController({
@@ -1453,6 +1456,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return isChanged;
   }
   async initialize(core, options = {}) {
+    this.resetPickupTimingCache();
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1504,6 +1508,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
+    this.resetPickupTimingCache();
     this.serverOrderChangeUnsubscribe?.();
     this.serverOrderChangeUnsubscribe = null;
     Object.keys(this.store).forEach(key => {
@@ -4090,6 +4095,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async setOtherParams(params, {
     cover = false
   } = {}) {
+    const previousPickupTimingScope = this.getPickupTimingScope();
     if (cover) {
       this.otherParams = {
         ...params
@@ -4101,6 +4107,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       };
     }
     this.cacheId = this.otherParams?.cacheId;
+    if (previousPickupTimingScope !== this.getPickupTimingScope()) this.resetPickupTimingCache();
     await this.syncOtherParamsToSubModules(params, {
       cover
     });

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

@@ -10,14 +10,20 @@ interface PickupTimingHost {
     isPos: () => boolean;
     now?: () => Date;
 }
-/** Coordinates fresh configuration with the independent appointment; UI keeps edit drafts. */
+/** Reuses runtime configuration and schedules; every calculation still uses the live clock. */
 export declare class PickupTimingController {
     private readonly host;
     private latest?;
-    private readonly requests;
+    private runtime?;
     private writeSequence;
     constructor(host: PickupTimingHost);
     private now;
+    /** A new solution context or an explicit settings refresh invalidates pending work too. */
+    invalidate(): void;
+    private assertCurrentRuntime;
+    private getRuntime;
+    private loadConfig;
+    private loadSchedules;
     private snapshot;
     getAvailability(params?: {
         date?: string;

package/lib/solution/BaseSales/pickupTiming.js

@@ -17,10 +17,10 @@ async function withTimeout(request) {
   }
 }
 
-/** Coordinates fresh configuration with the independent appointment; UI keeps edit drafts. */
+/** Reuses runtime configuration and schedules; every calculation still uses the live clock. */
 class PickupTimingController {
   latest;
-  requests = new Map();
+  runtime;
   writeSequence = 0;
   constructor(host) {
     this.host = host;
@@ -28,52 +28,99 @@ class PickupTimingController {
   now() {
     return this.host.now?.() ?? new Date();
   }
-  async snapshot(force, includeSchedule, tolerateScheduleError = false) {
+
+  /** A new solution context or an explicit settings refresh invalidates pending work too. */
+  invalidate() {
+    this.runtime = undefined;
+    this.latest = undefined;
+    this.writeSequence += 1;
+  }
+  assertCurrentRuntime(runtime) {
+    if (this.runtime !== runtime || runtime.scope !== this.host.getScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+  }
+  getRuntime() {
     const scope = this.host.getScope();
-    const key = `${scope}:${force}:${includeSchedule}:${tolerateScheduleError}`;
-    let request = this.requests.get(key);
-    if (!request) {
-      request = (async () => {
-        const config = (0, _FulfillmentTiming.normalizePickupTimingConfig)(await withTimeout(this.host.loadOpenData(force)));
-        const timezone = this.host.getTimezone();
-        let schedules = [];
-        let error;
-        if (includeSchedule && config.handoverModes.includes('pick_up') && config.timingMode !== 'asap_only' && config.scheduleIds.length) {
-          try {
-            const schedule = this.host.getSchedule();
-            if (!schedule) throw new Error('Pickup schedule is unavailable. Please try again.');
-            await withTimeout(schedule.loadAllSchedule({
-              useCache: false
-            }));
-            const ids = [...new Set([...config.scheduleIds, ...(config.operatingHoursScheduleIds || [])])];
-            schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(ids) || []);
-          } catch (reason) {
-            if (!tolerateScheduleError) throw reason;
-            error = reason instanceof Error ? reason.message : 'Pickup schedule is unavailable. Please try again.';
-          }
-        }
-        if (scope !== this.host.getScope()) throw new Error('Store settings changed. Please try again.');
-        return {
-          config,
-          timezone,
-          schedules,
-          scope,
-          error
-        };
+    if (this.runtime?.scope !== scope) {
+      this.latest = undefined;
+      this.runtime = {
+        scope
+      };
+    }
+    return this.runtime;
+  }
+  async loadConfig(runtime) {
+    if (runtime.config) return runtime.config;
+    if (!runtime.configRequest) {
+      const request = (async () => {
+        const config = (0, _FulfillmentTiming.normalizePickupTimingConfig)(await withTimeout(this.host.loadOpenData(false)));
+        this.assertCurrentRuntime(runtime);
+        runtime.config = config;
+        return config;
       })();
-      this.requests.set(key, request);
+      runtime.configRequest = request;
     }
+    const request = runtime.configRequest;
     try {
-      const result = await request;
-      if (scope !== this.host.getScope()) throw new Error('Store settings changed. Please try again.');
-      this.latest = result;
-      return result;
+      return await request;
     } finally {
-      if (this.requests.get(key) === request) this.requests.delete(key);
+      if (runtime.configRequest === request) runtime.configRequest = undefined;
     }
   }
+  async loadSchedules(runtime, config) {
+    if (runtime.schedules) return runtime.schedules;
+    if (!runtime.scheduleRequest) {
+      const request = (async () => {
+        const schedule = this.host.getSchedule();
+        if (!schedule) throw new Error('Pickup schedule is unavailable. Please try again.');
+        // Reuse the catalog loaded by solution initialization, including its in-flight request.
+        await withTimeout(schedule.loadAllSchedule({
+          useCache: true
+        }));
+        this.assertCurrentRuntime(runtime);
+        const ids = [...new Set([...config.scheduleIds, ...(config.operatingHoursScheduleIds || [])])];
+        const schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(ids) || []);
+        runtime.schedules = schedules;
+        return schedules;
+      })();
+      runtime.scheduleRequest = request;
+    }
+    const request = runtime.scheduleRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.scheduleRequest === request) runtime.scheduleRequest = undefined;
+    }
+  }
+  async snapshot(includeSchedule, tolerateScheduleError = false) {
+    const runtime = this.getRuntime();
+    const config = await this.loadConfig(runtime);
+    this.assertCurrentRuntime(runtime);
+    let schedules = [];
+    let error;
+    if (includeSchedule && config.handoverModes.includes('pick_up') && config.timingMode !== 'asap_only' && config.scheduleIds.length) {
+      try {
+        schedules = await this.loadSchedules(runtime, config);
+      } catch (reason) {
+        if (!tolerateScheduleError) throw reason;
+        error = reason instanceof Error ? reason.message : 'Pickup schedule is unavailable. Please try again.';
+      }
+    }
+    this.assertCurrentRuntime(runtime);
+    const result = {
+      config,
+      timezone: this.host.getTimezone(),
+      schedules,
+      scope: runtime.scope,
+      error
+    };
+    this.latest = result;
+    return result;
+  }
   async getAvailability(params = {}) {
-    const snapshot = await this.snapshot(params.force !== false, true, true);
+    // `force` remains accepted for older callers; refresh recomputes time using the runtime catalog.
+    const snapshot = await this.snapshot(true, true);
     const now = this.now();
     try {
       return {
@@ -121,7 +168,7 @@ class PickupTimingController {
     };
   }
   async validateSnapshot(selection) {
-    const snapshot = await this.snapshot(true, selection.serviceType === 'pick_up' && selection.mode === 'scheduled' && selection.source !== 'pos_manual');
+    const snapshot = await this.snapshot(selection.serviceType === 'pick_up' && selection.mode === 'scheduled' && selection.source !== 'pos_manual');
     const now = this.now();
     const result = (0, _FulfillmentTiming.validatePickupTimingSelection)(selection, {
       ...snapshot,
@@ -205,7 +252,7 @@ class PickupTimingController {
       }
       return this.getSelection();
     }
-    const snapshot = await this.snapshot(true, false);
+    const snapshot = await this.snapshot(false);
     if (order !== this.host.getOrder() || order.getTempOrder() !== tempOrder || sequence !== this.writeSequence) {
       throw new Error('The order changed. Please choose the pickup time again.');
     }

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

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

@@ -52,10 +52,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
      * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
      */
-    private prepareInvoiceTemplateAtSolutionReady;
+    protected prepareInvoiceTemplateAtSolutionReady(injectedOpenData?: OpenDataConfig): Promise<void>;
     protected getBookingTicketBusinessCode(): string | null;
     private getIdGeneratorPlugin;
-    private loadOpenDataConfig;
+    protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
     getOpenData(): Promise<OpenDataConfig | null>;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;

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

@@ -60,6 +60,12 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected defaultVersion: string;
     protected store: UnifiedBookingSalesState;
     protected pickupTimingEnabled: boolean;
+    private runtimeOpenDataScope;
+    private runtimeOpenDataSnapshot;
+    private runtimeOpenDataModule;
+    private runtimeOpenDataCore;
+    private runtimeOpenDataGeneration;
+    private runtimeOpenDataDestroyed;
     private unifiedProductCatalog;
     private availabilityRuntimeOffsetMinutes;
     private availabilityScheduleCatalog;
@@ -143,13 +149,14 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     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.
-     */
+    private getRuntimeOpenDataScope;
+    private resetRuntimeOpenData;
+    protected prepareInvoiceTemplateAtSolutionReady(injectedOpenData?: OpenDataConfig): Promise<void>;
+    protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
+    /** A successful configuration belongs to this business runtime until an explicit refresh. */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
-    protected loadPickupTimingOpenData(force: boolean): Promise<Record<string, unknown>>;
+    protected loadPickupTimingOpenData(_force: boolean): Promise<Record<string, unknown>>;
     private resetAllergyItemRuleState;
     private fetchAllergyItemRuleConfigs;
     private ensureAllergyItemRuleConfigsLoaded;