@pisell/pisellos 2.2.260 → 2.2.261

package/dist/modules/SurchargeList/index.js

@@ -17,6 +17,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 export * from "./types";
+var DEFAULT_SURCHARGE_CHANNEL = 'online-store';
 export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SurchargeListModule, _BaseModule);
   var _super = _createSuper(SurchargeListModule);
@@ -28,14 +29,15 @@ export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
-    _defineProperty(_assertThisInitialized(_this), "loadingPromise", null);
+    _defineProperty(_assertThisInitialized(_this), "loadingPromises", new Map());
+    _defineProperty(_assertThisInitialized(_this), "requestVersion", 0);
     return _this;
   }
   _createClass(SurchargeListModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$initialState, _options$initialState2, _options$initialState3;
+        var _options$initialState, _options$initialState2, _options$initialState3, _options$otherParams, _options$initialState4;
         var hasInitialSurchargeList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -45,13 +47,14 @@ export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
               this.request = this.core.getPlugin('request');
               hasInitialSurchargeList = Array.isArray((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.surchargeList);
               this.store.surchargeList = hasInitialSurchargeList ? (_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.surchargeList : [];
-              this.store.isLoaded = Boolean((_options$initialState3 = options.initialState) === null || _options$initialState3 === void 0 ? void 0 : _options$initialState3.isLoaded) || hasInitialSurchargeList;
+              this.store.channel = ((_options$initialState3 = options.initialState) === null || _options$initialState3 === void 0 ? void 0 : _options$initialState3.channel) || ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.channel) || DEFAULT_SURCHARGE_CHANNEL;
+              this.store.isLoaded = Boolean((_options$initialState4 = options.initialState) === null || _options$initialState4 === void 0 ? void 0 : _options$initialState4.isLoaded) || hasInitialSurchargeList;
               if (this.request) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('SurchargeListModule 需要 request 插件支持');
-            case 8:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -62,34 +65,43 @@ export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+  }, {
+    key: "resolveChannel",
+    value: function resolveChannel(query) {
+      return (query === null || query === void 0 ? void 0 : query.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    }
   }, {
     key: "getSurchargeList",
     value: function () {
-      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(query) {
+        var channel, loadingPromise, nextPromise;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!this.store.isLoaded) {
-                _context2.next = 2;
+              channel = this.resolveChannel(query);
+              if (!(this.store.isLoaded && this.store.channel === channel)) {
+                _context2.next = 3;
                 break;
               }
               return _context2.abrupt("return", this.store.surchargeList);
-            case 2:
-              if (!this.loadingPromise) {
-                _context2.next = 4;
+            case 3:
+              loadingPromise = this.loadingPromises.get(channel);
+              if (!loadingPromise) {
+                _context2.next = 6;
                 break;
               }
-              return _context2.abrupt("return", this.loadingPromise);
-            case 4:
-              this.loadingPromise = this.loadSurchargeList();
-              return _context2.abrupt("return", this.loadingPromise);
+              return _context2.abrupt("return", loadingPromise);
             case 6:
+              nextPromise = this.loadSurchargeList(channel);
+              this.loadingPromises.set(channel, nextPromise);
+              return _context2.abrupt("return", nextPromise);
+            case 9:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function getSurchargeList() {
+      function getSurchargeList(_x3) {
         return _getSurchargeList.apply(this, arguments);
       }
       return getSurchargeList;
@@ -97,19 +109,22 @@ export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "refreshSurchargeList",
     value: function () {
-      var _refreshSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _refreshSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(query) {
+        var channel, nextPromise;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              this.loadingPromise = this.loadSurchargeList();
-              return _context3.abrupt("return", this.loadingPromise);
-            case 2:
+              channel = this.resolveChannel(query);
+              nextPromise = this.loadSurchargeList(channel);
+              this.loadingPromises.set(channel, nextPromise);
+              return _context3.abrupt("return", nextPromise);
+            case 4:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function refreshSurchargeList() {
+      function refreshSurchargeList(_x4) {
         return _refreshSurchargeList.apply(this, arguments);
       }
       return refreshSurchargeList;
@@ -117,42 +132,50 @@ export var SurchargeListModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadSurchargeList",
     value: function () {
-      var _loadSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var surchargeList;
+      var _loadSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(channel) {
+        var currentRequestVersion, surchargeList, nextSurchargeList;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.prev = 0;
-              _context4.next = 3;
+              currentRequestVersion = ++this.requestVersion;
+              _context4.prev = 1;
+              _context4.next = 4;
               return this.request.get('/order/custom-surcharge/available/v2', {
-                channel: 'online-store',
+                channel: channel,
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
                 with: ['relationSchedule']
               });
-            case 3:
+            case 4:
               surchargeList = _context4.sent;
-              this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              this.store.isLoaded = true;
-              return _context4.abrupt("return", this.store.surchargeList);
-            case 9:
-              _context4.prev = 9;
-              _context4.t0 = _context4["catch"](0);
+              nextSurchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
+              if (currentRequestVersion === this.requestVersion) {
+                this.store.surchargeList = nextSurchargeList;
+                this.store.channel = channel;
+                this.store.isLoaded = true;
+              }
+              return _context4.abrupt("return", nextSurchargeList);
+            case 10:
+              _context4.prev = 10;
+              _context4.t0 = _context4["catch"](1);
               console.warn('[SurchargeListModule] 加载附加费配置失败', _context4.t0);
-              this.store.surchargeList = [];
-              this.store.isLoaded = true;
-              return _context4.abrupt("return", this.store.surchargeList);
+              if (currentRequestVersion === this.requestVersion) {
+                this.store.surchargeList = [];
+                this.store.channel = channel;
+                this.store.isLoaded = true;
+              }
+              return _context4.abrupt("return", []);
             case 15:
               _context4.prev = 15;
-              this.loadingPromise = null;
+              this.loadingPromises.delete(channel);
               return _context4.finish(15);
             case 18:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 9, 15, 18]]);
+        }, _callee4, this, [[1, 10, 15, 18]]);
       }));
-      function loadSurchargeList() {
+      function loadSurchargeList(_x5) {
         return _loadSurchargeList.apply(this, arguments);
       }
       return loadSurchargeList;

package/dist/modules/SurchargeList/types.d.ts

@@ -4,8 +4,12 @@ export interface SurchargeListItem {
 export interface SurchargeListState {
     surchargeList: SurchargeListItem[];
     isLoaded: boolean;
+    channel?: string;
+}
+export interface SurchargeListQuery {
+    channel?: string;
 }
 export interface SurchargeListModuleAPI {
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
 }

package/dist/server/index.d.ts

@@ -47,8 +47,6 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -212,48 +210,6 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
-    /**
-     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
-     */
-    private buildProductQueryResultPayload;
-    /**
-     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
-     * strategy_context.enable_schedule_reload === false 时关闭。
-     */
-    private shouldScheduleProductQueryReload;
-    /**
-     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
-     */
-    private clearSubscriberScheduleTimers;
-    /**
-     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
-     */
-    private removeScheduleTimerRef;
-    /**
-     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
-     */
-    private computeScheduleTimePointDelayMs;
-    /**
-     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
-     */
-    private refreshSubscriberScheduleAtExecution;
-    /**
-     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
-     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
-     */
-    private scheduleSubscriberTimePointReloads;
-    /**
-     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
-     */
-    private onScheduleTimePointTimerFire;
-    /**
-     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
-     */
-    private recomputeAndNotifySubscriber;
-    /**
-     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
-     */
-    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -475,6 +431,9 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
+    private handleMachinecodeBatchMeta;
+    private resolveMachinecodeBatchMetadataLookup;
+    private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
@@ -606,12 +565,6 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
-    /**
-     * 构建商品格式化上下文。
-     *
-     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-     */
-    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发