@pisell/pisellos 0.10.51 → 0.10.53

package/dist/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/dist/modules/Schedule/index.js

@@ -10,6 +10,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -45,49 +47,52 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
     _defineProperty(_assertThisInitialized(_this), "hasLoadedScheduleList", false);
+    _defineProperty(_assertThisInitialized(_this), "scheduleListPromise", null);
+    _defineProperty(_assertThisInitialized(_this), "scheduleListRequestVersion", 0);
+    _defineProperty(_assertThisInitialized(_this), "scheduleCatalogScope", '');
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     return _this;
   }
   _createClass(ScheduleModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$otherParams, _options$otherParams2;
+        var _options$initialState;
+        var initialScheduleList, hasInitialScheduleList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              // The store proxies initialState, so capture its input before resets write through it.
+              initialScheduleList = (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.scheduleList;
+              hasInitialScheduleList = Array.isArray(initialScheduleList);
+              this.resetScheduleCatalog();
               this.core = core;
 
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               if (this.request) {
-                _context.next = 4;
+                _context.next = 7;
                 break;
               }
               throw new Error('ScheduleModule 需要 request 插件支持');
-            case 4:
+            case 7:
               // if (options?.initialState) {
               //   this.state = { ...this.state, ...options.initialState }
               // }
               this.store = options === null || options === void 0 ? void 0 : 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 = options.otherParams) !== null && _options$otherParams !== void 0 && _options$otherParams.cacheId) {
-                this.openCache = options.otherParams.openCache;
-                this.cacheId = options.otherParams.cacheId;
-              }
-              if ((_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
-                this.fatherModule = options.otherParams.fatherModule;
-              }
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -109,9 +114,41 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     value: function updateOtherParams(params) {
       var _otherParams$openCach;
       var otherParams = params || {};
+      this.otherParams = _objectSpread({}, otherParams);
       this.openCache = (_otherParams$openCach = otherParams.openCache) !== null && _otherParams$openCach !== void 0 ? _otherParams$openCach : false;
       this.cacheId = otherParams.cacheId;
       this.fatherModule = otherParams.fatherModule;
+      this.syncScheduleCatalogScope();
+    }
+  }, {
+    key: "syncScheduleCatalogScope",
+    value: function syncScheduleCatalogScope() {
+      var _this$core, _params$businessCode;
+      var context = (_this$core = this.core) === null || _this$core === void 0 ? void 0 : _this$core.context;
+      var shopId = typeof (context === null || context === void 0 ? void 0 : context.getData) === 'function' ? context.getData('shop_id') : context === null || context === void 0 ? void 0 : context.shop_id;
+      var params = this.otherParams;
+      var scope = JSON.stringify([this.cacheId, this.fatherModule, (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : params.business_code, params.channel, params.platform, params.businessTimezone, shopId].map(function (value) {
+        return String(value !== null && value !== void 0 ? value : '').trim();
+      }));
+      if (scope !== this.scheduleCatalogScope) {
+        this.resetScheduleCatalog();
+        this.scheduleCatalogScope = scope;
+      }
+    }
+  }, {
+    key: "resetScheduleCatalog",
+    value: function resetScheduleCatalog() {
+      this.scheduleListRequestVersion += 1;
+      this.scheduleListPromise = null;
+      this.hasLoadedScheduleList = false;
+      this.store.scheduleList = [];
+      this.store.map = new Map();
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.resetScheduleCatalog();
+      _get(_getPrototypeOf(ScheduleModule.prototype), "destroy", this).call(this);
     }
 
     /**
@@ -123,37 +160,99 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     key: "loadAllSchedule",
     value: (function () {
       var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _options$useCache, _scheduleList$data;
+        var _options$useCache;
         var options,
-          scheduleList,
+          useCache,
+          requestVersion,
+          promise,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-              _context2.next = 3;
-              return this.request.get("/schedule", {
-                num: 999
-              }, {
-                useCache: (_options$useCache = options.useCache) !== null && _options$useCache !== void 0 ? _options$useCache : true
-              });
-            case 3:
-              scheduleList = _context2.sent;
-              this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
-            case 5:
+              this.syncScheduleCatalogScope();
+              useCache = (_options$useCache = options.useCache) !== null && _options$useCache !== void 0 ? _options$useCache : true;
+              if (!useCache) {
+                _context2.next = 8;
+                break;
+              }
+              if (!this.scheduleListPromise) {
+                _context2.next = 6;
+                break;
+              }
+              return _context2.abrupt("return", this.scheduleListPromise);
+            case 6:
+              if (!this.hasLoadedScheduleList) {
+                _context2.next = 8;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 8:
+              requestVersion = ++this.scheduleListRequestVersion;
+              promise = this.loadScheduleCatalog(useCache, requestVersion);
+              this.scheduleListPromise = promise;
+              _context2.prev = 11;
+              _context2.next = 14;
+              return promise;
+            case 14:
+              _context2.prev = 14;
+              if (this.scheduleListPromise === promise) {
+                this.scheduleListPromise = null;
+              }
+              return _context2.finish(14);
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this);
+        }, _callee2, this, [[11,, 14, 17]]);
       }));
       function loadAllSchedule() {
         return _loadAllSchedule.apply(this, arguments);
       }
       return loadAllSchedule;
     }())
+  }, {
+    key: "loadScheduleCatalog",
+    value: function () {
+      var _loadScheduleCatalog = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(useCache, requestVersion) {
+        var response, _response$data;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.request.get("/schedule", {
+                num: 999
+              }, {
+                useCache: useCache
+              });
+            case 2:
+              response = _context3.sent;
+              if (!(response.code !== undefined && Number(response.code) !== 200 || response.status === false || typeof response.status === 'number' && response.status >= 400 || response.success === false)) {
+                _context3.next = 5;
+                break;
+              }
+              throw new Error(response.message || 'Schedule catalog request failed');
+            case 5:
+              this.syncScheduleCatalogScope();
+              // A refresh or a different runtime may have superseded this request.
+              if (requestVersion === this.scheduleListRequestVersion) {
+                this.setScheduleList(((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.list) || []);
+              }
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function loadScheduleCatalog(_x3, _x4) {
+        return _loadScheduleCatalog.apply(this, arguments);
+      }
+      return loadScheduleCatalog;
+    }()
   }, {
     key: "setScheduleList",
     value: function setScheduleList(list) {
+      this.syncScheduleCatalogScope();
       this.store.scheduleList = list;
       this.syncScheduleMap();
       this.hasLoadedScheduleList = true;
@@ -168,20 +267,22 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleList",
     value: function getScheduleList() {
+      this.syncScheduleCatalogScope();
       return this.store.scheduleList || [];
     }
   }, {
     key: "isScheduleListLoaded",
     value: function isScheduleListLoaded() {
+      this.syncScheduleCatalogScope();
       return this.hasLoadedScheduleList;
     }
   }, {
     key: "loadScheduleAvailableDate",
     value: function () {
-      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref) {
         var startDate, endDate, custom_page_id, channel, dates, res, responseData, dateList, otherProductIds;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               startDate = _ref.startDate, endDate = _ref.endDate, custom_page_id = _ref.custom_page_id, channel = _ref.channel;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
@@ -193,12 +294,12 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               dates = disableAllDates(dates);
               // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
               if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
-                _context3.next = 6;
+                _context4.next = 6;
                 break;
               }
-              return _context3.abrupt("return", dates);
+              return _context4.abrupt("return", dates);
             case 6:
-              _context3.next = 8;
+              _context4.next = 8;
               return this.request.get("/schedule/product/availability/v2", {
                 start_date: startDate,
                 end_date: endDate,
@@ -206,7 +307,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
                 channel: channel
               });
             case 8:
-              res = _context3.sent;
+              res = _context4.sent;
               responseData = res.data || {};
               dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
               otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
@@ -214,10 +315,10 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               this.setOtherProductsIds(otherProductIds);
               // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
               if (!(!dateList.length && !otherProductIds.length || dayjs(endDate).isBefore(dayjs(), 'day'))) {
-                _context3.next = 16;
+                _context4.next = 16;
                 break;
               }
-              return _context3.abrupt("return", dates);
+              return _context4.abrupt("return", dates);
             case 16:
               if (otherProductIds.length) {
                 // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
@@ -235,14 +336,14 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
                 });
               }
               dates = disableDatesBeforeOneDay(dates);
-              return _context3.abrupt("return", dates);
+              return _context4.abrupt("return", dates);
             case 19:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function loadScheduleAvailableDate(_x3) {
+      function loadScheduleAvailableDate(_x5) {
         return _loadScheduleAvailableDate.apply(this, arguments);
       }
       return loadScheduleAvailableDate;
@@ -252,6 +353,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     value: function getScheduleListByIds(ids) {
       var _this2 = this,
         _this$store$scheduleL;
+      this.syncScheduleCatalogScope();
       var idSet = new Set(ids.map(function (id) {
         return String(id);
       }));

package/dist/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/dist/solution/BaseSales/index.js

@@ -1623,6 +1623,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         cacheId: this.cacheId
       });
     }
+  }, {
+    key: "resetPickupTimingCache",
+    value: function resetPickupTimingCache() {
+      var _this$pickupTimingCon;
+      (_this$pickupTimingCon = this.pickupTimingController) === null || _this$pickupTimingCon === void 0 || _this$pickupTimingCon.invalidate();
+    }
   }, {
     key: "getPickupTimingController",
     value: function getPickupTimingController() {
@@ -2044,6 +2050,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               options = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : {};
+              this.resetPickupTimingCache();
               this.core = core;
               this.initializeOptions = options || {};
               this.paymentNumberDevicePrefix = null;
@@ -2085,21 +2092,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 }));
               });
               if (!(this.store.schedule && !this.isScheduleListLoaded(this.store.schedule))) {
-                _context13.next = 19;
+                _context13.next = 20;
                 break;
               }
-              _context13.next = 19;
+              _context13.next = 20;
               return this.store.schedule.loadAllSchedule();
-            case 19:
+            case 20:
               if (this.store.order && typeof ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.enableTempOrderPersist) === 'boolean') {
                 this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
               }
-              _context13.next = 22;
+              _context13.next = 23;
               return this.getPaymentMethodsAsync();
-            case 22:
+            case 23:
               this.registerServerOrderChangeSync();
               this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 24:
+            case 25:
             case "end":
               return _context13.stop();
           }
@@ -2119,6 +2126,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
+              this.resetPickupTimingCache();
               (_this$serverOrderChan2 = this.serverOrderChangeUnsubscribe) === null || _this$serverOrderChan2 === void 0 || _this$serverOrderChan2.call(this);
               this.serverOrderChangeUnsubscribe = null;
               Object.keys(this.store).forEach(function (key) {
@@ -2137,11 +2145,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               this.queuedServerOrderChanges = [];
               this.salesDetailLoadSequence += 1;
               this.walletAssetsRefreshSequence += 1;
-              _context14.next = 10;
+              _context14.next = 11;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
-            case 10:
-              _get(_getPrototypeOf(BaseSalesImpl.prototype), "destroy", this).call(this);
             case 11:
+              _get(_getPrototypeOf(BaseSalesImpl.prototype), "destroy", this).call(this);
+            case 12:
             case "end":
               return _context14.stop();
           }
@@ -6831,22 +6839,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         var _ref55,
           _ref55$cover,
           cover,
+          previousPickupTimingScope,
           _args71 = arguments;
         return _regeneratorRuntime().wrap(function _callee71$(_context71) {
           while (1) switch (_context71.prev = _context71.next) {
             case 0:
               _ref55 = _args71.length > 1 && _args71[1] !== undefined ? _args71[1] : {}, _ref55$cover = _ref55.cover, cover = _ref55$cover === void 0 ? false : _ref55$cover;
+              previousPickupTimingScope = this.getPickupTimingScope();
               if (cover) {
                 this.otherParams = _objectSpread({}, params);
               } else {
                 this.otherParams = _objectSpread(_objectSpread({}, this.otherParams), params);
               }
               this.cacheId = (_this$otherParams41 = this.otherParams) === null || _this$otherParams41 === void 0 ? void 0 : _this$otherParams41.cacheId;
-              _context71.next = 5;
+              if (previousPickupTimingScope !== this.getPickupTimingScope()) this.resetPickupTimingCache();
+              _context71.next = 7;
               return this.syncOtherParamsToSubModules(params, {
                 cover: cover
               });
-            case 5:
+            case 7:
             case "end":
               return _context71.stop();
           }

package/dist/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;