@pisell/pisellos 2.3.17 → 2.3.19

package/dist/modules/SalesSummary/index.js

@@ -30,6 +30,7 @@ var salesSummaryDataKeys = {
   taxTitle: 'tax_title',
   taxCountryCode: 'tax_country_code'
 };
+var DEFAULT_SURCHARGE_CHANNEL = 'online-store';
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
   var _super = _createSuper(SalesSummaryModule);
@@ -43,13 +44,15 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "surchargeListModuleName", 'surchargeList');
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
+    _defineProperty(_assertThisInitialized(_this), "surchargeListChannel", DEFAULT_SURCHARGE_CHANNEL);
     return _this;
   }
   _createClass(SalesSummaryModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$initialState, _options$initialState2, _options$otherParams;
+        var _options$initialState, _options$initialState2, _this$otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -57,24 +60,25 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               this.store = options.store;
               this.appPlugin = this.core.getPlugin('app');
               this.request = this.core.getPlugin('request');
+              this.otherParams = options.otherParams || {};
               this.store.surchargeList = ((_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.surchargeList) || [];
               this.store.summary = ((_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.summary) || createEmptySalesSummary();
-              this.surchargeListModuleName = ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.surchargeListModuleName) || 'surchargeList';
+              this.surchargeListModuleName = ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.surchargeListModuleName) || 'surchargeList';
               if (this.appPlugin) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 app 插件支持');
-            case 9:
+            case 10:
               if (this.request) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 request 插件支持');
-            case 11:
-              _context.next = 13;
+            case 12:
+              _context.next = 14;
               return this.getSurchargeList();
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -86,30 +90,32 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
      *
      * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
      */
   }, {
     key: "updateOtherParams",
     value: (function () {
       var _updateOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var nextSurchargeListModuleName;
+        var previousChannel, nextSurchargeListModuleName, nextChannel, shouldReload;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              previousChannel = this.resolveChannel();
               nextSurchargeListModuleName = (params === null || params === void 0 ? void 0 : params.surchargeListModuleName) || 'surchargeList';
-              if (!(nextSurchargeListModuleName === this.surchargeListModuleName)) {
-                _context2.next = 3;
+              nextChannel = this.resolveChannel(params);
+              shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+              this.otherParams = params || {};
+              this.surchargeListModuleName = nextSurchargeListModuleName;
+              if (!shouldReload) {
+                _context2.next = 9;
                 break;
               }
-              return _context2.abrupt("return");
-            case 3:
-              this.surchargeListModuleName = nextSurchargeListModuleName;
-              _context2.next = 6;
-              return this.getSurchargeList();
-            case 6:
+              _context2.next = 9;
+              return this.getSurchargeList(nextChannel);
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -120,49 +126,63 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return updateOtherParams;
     }())
+  }, {
+    key: "resolveChannel",
+    value: function resolveChannel() {
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.otherParams;
+      return (params === null || params === void 0 ? void 0 : params.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    }
   }, {
     key: "getSurchargeList",
     value: function () {
       var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var surchargeListModule, surchargeList;
+        var channel,
+          surchargeListModule,
+          surchargeList,
+          _args3 = arguments;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
+              channel = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : this.resolveChannel();
+              _context3.prev = 1;
               surchargeListModule = this.core.getModule(this.surchargeListModuleName);
               if (!(surchargeListModule !== null && surchargeListModule !== void 0 && surchargeListModule.getSurchargeList)) {
-                _context3.next = 7;
+                _context3.next = 9;
                 break;
               }
-              _context3.next = 5;
-              return surchargeListModule.getSurchargeList();
-            case 5:
+              _context3.next = 6;
+              return surchargeListModule.getSurchargeList({
+                channel: channel
+              });
+            case 6:
               this.store.surchargeList = _context3.sent;
+              this.surchargeListChannel = channel;
               return _context3.abrupt("return");
-            case 7:
-              _context3.next = 9;
+            case 9:
+              _context3.next = 11;
               return this.request.get('/order/custom-surcharge/available/v2', {
-                // TODO 真实的渠道
-                channel: 'online-store',
+                channel: channel,
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
                 with: ['relationSchedule']
               });
-            case 9:
+            case 11:
               surchargeList = _context3.sent;
               this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              _context3.next = 17;
+              this.surchargeListChannel = channel;
+              _context3.next = 21;
               break;
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](0);
+            case 16:
+              _context3.prev = 16;
+              _context3.t0 = _context3["catch"](1);
               console.warn('[SalesSummaryModule] 加载附加费配置失败', _context3.t0);
               this.store.surchargeList = [];
-            case 17:
+              this.surchargeListChannel = channel;
+            case 21:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 13]]);
+        }, _callee3, this, [[1, 16]]);
       }));
       function getSurchargeList() {
         return _getSurchargeList.apply(this, arguments);
@@ -194,11 +214,19 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
         var _this$store$surcharge, _ref;
-        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
+        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount;
+              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount, channel = params.channel;
+              summaryChannel = channel || this.resolveChannel();
+              if (!(summaryChannel !== this.surchargeListChannel)) {
+                _context4.next = 5;
+                break;
+              }
+              _context4.next = 5;
+              return this.getSurchargeList(summaryChannel);
+            case 5:
               taxConfig = this.getTaxConfig();
               summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
               needScheduleIds = (((_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
@@ -237,7 +265,7 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.summary = summaryWithTaxMeta;
               return _context4.abrupt("return", summaryWithTaxMeta);
-            case 11:
+            case 15:
             case "end":
               return _context4.stop();
           }

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

@@ -63,5 +63,6 @@ export interface SalesSummaryModuleAPI {
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<SalesSummaryData>;
 }

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

@@ -1,16 +1,18 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { SurchargeListItem, SurchargeListModuleAPI } from './types';
+import { SurchargeListItem, SurchargeListModuleAPI, SurchargeListQuery } from './types';
 export * from './types';
 export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private request;
     private store;
-    private loadingPromise;
+    private loadingPromises;
+    private requestVersion;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    getSurchargeList(): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    private resolveChannel;
+    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
     private loadSurchargeList;
 }

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/modules/order/index.js

@@ -448,9 +448,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var appPlugin = this.core.getPlugin('app');
       var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
       if (app) {
-        var _this$store$createdAt;
         var coreData = app.data.store.getStore().getDataByModel('core');
-        if (!((_this$store$createdAt = this.store.createdAtQuery) !== null && _this$store$createdAt !== void 0 && _this$store$createdAt.sales_time_between) && coreData !== null && coreData !== void 0 && coreData.core) {
+        if (coreData !== null && coreData !== void 0 && coreData.core) {
           var today = dayjs();
           if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
             var operatingDayBoundary = coreData.core.operating_day_boundary;

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

@@ -49,6 +49,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queuedAutoPaymentSync;
     private autoPaymentSyncFlushing;
     private autoPaymentSyncTimer;
+    private salesDetailLoadInFlight;
+    private serverOrderChangeUnsubscribe;
+    private serverOrderChangeHydrateInFlight;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -69,6 +72,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
+    private isCurrentSalesOrderRecord;
+    private syncCurrentSalesDetailFromServerOrderChange;
+    private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;