@pisell/pisellos 2.3.17 → 2.3.18

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

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -197,6 +197,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;

package/dist/modules/Order/index.js

@@ -1995,11 +1995,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       return currentAmountGap === snapshotAmountGap;
     }
+  }, {
+    key: "hasShopDiscountChangedFromSnapshot",
+    value: function hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+      var _snapshot$shop_discou;
+      var snapshotSummary = snapshot.summary && _typeof(snapshot.summary) === 'object' ? snapshot.summary : {};
+      var snapshotShopDiscount = (_snapshot$shop_discou = snapshot.shop_discount) !== null && _snapshot$shop_discou !== void 0 ? _snapshot$shop_discou : snapshotSummary.shop_discount;
+      if (snapshotShopDiscount === undefined || snapshotShopDiscount === null || snapshotShopDiscount === '') {
+        return !new Decimal(tempOrder.shop_discount || 0).equals(0);
+      }
+      return !new Decimal(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+    }
   }, {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
-    value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-      var snapshot = this.getOriginalSalesSnapshot(tempOrder);
-      if (!snapshot) return null;
+    value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
       if (currentFingerprint !== snapshot.productFingerprint) {
         var currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
@@ -2660,8 +2669,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(options) {
-        var _ref47, _salesSummaryResult$e;
-        var tempOrder, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
+        var _this$otherParams2, _ref47, _salesSummaryResult$e;
+        var tempOrder, originalSnapshot, hasShopDiscountChanged, shouldReuseOriginalSnapshot, snapshotSummary, shouldFullRecalculateFromSnapshot, summaryProducts, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummaryBase, emptySummaryWithDeposit, emptySummary, salesSummaryResult, roundingAmount, payServiceChargeAmount, hasSalesSummaryAmount, expectAmount, amountPaymentPatch, normalizedExpectAmountPatch, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee11$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -2673,14 +2682,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context13.abrupt("return", null);
             case 3:
               this.sanitizeTempOrderProducts(tempOrder);
-              snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+              originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+              hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+              shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+              snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
               if (!snapshotSummary) {
-                _context13.next = 7;
+                _context13.next = 10;
                 break;
               }
               return _context13.abrupt("return", snapshotSummary);
-            case 7:
-              shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+            case 10:
+              shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
               summaryProducts = shouldFullRecalculateFromSnapshot ? cloneDeep(tempOrder.products || []) : tempOrder.products;
               if (shouldFullRecalculateFromSnapshot) {
                 this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -2690,7 +2702,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context13.next = 23;
+                _context13.next = 26;
                 break;
               }
               emptyBaseSummary = _objectSpread(_objectSpread(_objectSpread({}, createEmptySummary()), existedSummary), {}, {
@@ -2717,14 +2729,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 summary: emptySummary
               });
               return _context13.abrupt("return", this.store.summary);
-            case 23:
-              _context13.next = 25;
-              return salesSummary.getSummary({
+            case 26:
+              _context13.next = 28;
+              return salesSummary.getSummary(_objectSpread({
                 products: summaryProducts,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
-              });
-            case 25:
+              }, (_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.channel ? {
+                channel: this.otherParams.channel
+              } : {}));
+            case 28:
               salesSummaryResult = _context13.sent;
               if (shouldFullRecalculateFromSnapshot) {
                 tempOrder.products = summaryProducts;
@@ -2771,7 +2785,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 summary: summary
               });
               return _context13.abrupt("return", this.store.summary);
-            case 43:
+            case 46:
             case "end":
               return _context13.stop();
           }
@@ -4439,14 +4453,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildCurrentSubmitPayloadForLocalPrint",
     value: function buildCurrentSubmitPayloadForLocalPrint(params) {
-      var _params$cacheId, _this$otherParams2, _ref68, _params$businessCode, _this$otherParams3, _this$otherParams4;
+      var _params$cacheId, _this$otherParams3, _ref68, _params$businessCode, _this$otherParams4, _this$otherParams5;
       var tempOrder = this.ensureTempOrder();
       this.persistTempOrder();
       var payload = buildSubmitPayload({
         tempOrder: tempOrder,
         cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
-        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform),
-        businessCode: (_ref68 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.platform),
+        businessCode: (_ref68 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.business_code,
         channel: params === null || params === void 0 ? void 0 : params.channel,
         type: params === null || params === void 0 ? void 0 : params.type,
         summary: this.store.summary || createEmptySummary(),
@@ -4552,7 +4566,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$cacheId2, _this$otherParams5, _ref72, _ref73, _submitSnapshot$busin, _this$otherParams6, _this$otherParams7, _submitSnapshot$type;
+        var _params$cacheId2, _this$otherParams6, _ref72, _ref73, _submitSnapshot$busin, _this$otherParams7, _this$otherParams8, _submitSnapshot$type;
         var tempOrder, shouldConfirmPendingVoucherPayments, hasPaymentOverride, preparedPaymentOverride, latestSummary, effectiveCacheId, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
@@ -4613,8 +4627,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-                businessCode: (_ref72 = (_ref73 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform),
+                businessCode: (_ref72 = (_ref73 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref73 !== void 0 ? _ref73 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
@@ -5371,6 +5385,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   products: cloneDeep(nextTempOrder.products || []),
                   payments: cloneDeep(nextTempOrder.payments || []),
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
+                  shop_discount: nextTempOrder.shop_discount || '0.00',
                   productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
                 }
               });

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

@@ -9,16 +9,19 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private store;
     private request;
     private surchargeListModuleName;
+    private otherParams;
+    private surchargeListChannel;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
      *
      * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
      */
     updateOtherParams(params: Record<string, any>): Promise<void>;
-    getSurchargeList(): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(channel?: string): Promise<void>;
     private getAppData;
     private getTaxConfig;
     getSummary(params: {
@@ -26,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

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

@@ -2604,18 +2604,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getWalletProductList",
     value: function getWalletProductList() {
-      var _this$store$order5, _tempOrder$products, _tempOrder$products2;
+      var _this$store$order5, _tempOrder$products;
       var tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return [];
       // 过滤出有 product_id的商品来，如果没有代表他是自定义商品，不需要参与 wallet
-      var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
-        return n.product_id;
-      });
-      var walletProducts = products.map(function (product) {
-        var _product$product_vari2, _product$is_charge_ta, _product$holder_id, _metadata$main_produc, _metadata$main_produc2;
+      // debugger
+      // const products = tempOrder?.products?.filter(n => n.product_id)
+
+      var walletProducts = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.products.map(function (product) {
+        var _product$holder_id, _product$product_vari2, _product$is_charge_ta, _metadata$main_produc, _metadata$main_produc2;
         var metadata = product.metadata || {};
+        var rawHolderId = (_product$holder_id = product.holder_id) !== null && _product$holder_id !== void 0 ? _product$holder_id : metadata.holder_id;
+        var holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
+        var holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : undefined;
         return {
-          product_id: product.product_id,
+          product_id: product.product_id || 0,
           product_variant_id: String((_product$product_vari2 = product.product_variant_id) !== null && _product$product_vari2 !== void 0 ? _product$product_vari2 : ''),
           quantity: product.num || 1,
           is_price_include_tax: tempOrder.is_price_include_tax,
@@ -2623,7 +2626,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           tax_fee: product.tax_fee,
           selling_price: Number(product.selling_price || 0),
           discount_list: product.discount_list || [],
-          holder_id: (_product$holder_id = product.holder_id) !== null && _product$holder_id !== void 0 ? _product$holder_id : metadata.holder_id,
+          holder_id: holder_id,
           original_price: product.original_price,
           main_product_original_price: (_metadata$main_produc = metadata.main_product_original_price) !== null && _metadata$main_produc !== void 0 ? _metadata$main_produc : product.original_price,
           main_product_selling_price: (_metadata$main_produc2 = metadata.main_product_selling_price) !== null && _metadata$main_produc2 !== void 0 ? _metadata$main_produc2 : product.selling_price,

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -66,7 +66,8 @@ function normalizeBundleItems(bundleItems) {
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
     normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);

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

@@ -441,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

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

@@ -1,49 +0,0 @@
-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/Order/index.d.ts

@@ -197,6 +197,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;

package/lib/modules/Order/index.js

@@ -1470,10 +1470,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
     return currentAmountGap === snapshotAmountGap;
   }
-  restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
-    const snapshot = this.getOriginalSalesSnapshot(tempOrder);
-    if (!snapshot)
-      return null;
+  hasShopDiscountChangedFromSnapshot(tempOrder, snapshot) {
+    const snapshotSummary = snapshot.summary && typeof snapshot.summary === "object" ? snapshot.summary : {};
+    const snapshotShopDiscount = snapshot.shop_discount ?? snapshotSummary.shop_discount;
+    if (snapshotShopDiscount === void 0 || snapshotShopDiscount === null || snapshotShopDiscount === "") {
+      return !new import_decimal.default(tempOrder.shop_discount || 0).equals(0);
+    }
+    return !new import_decimal.default(tempOrder.shop_discount || 0).equals(snapshotShopDiscount || 0);
+  }
+  restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
     const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
     if (currentFingerprint !== snapshot.productFingerprint) {
       const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
@@ -1974,14 +1979,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
+    var _a;
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
     if (!tempOrder)
       return null;
     this.sanitizeTempOrderProducts(tempOrder);
-    const snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+    const originalSnapshot = this.getOriginalSalesSnapshot(tempOrder);
+    const hasShopDiscountChanged = originalSnapshot ? this.hasShopDiscountChangedFromSnapshot(tempOrder, originalSnapshot) : false;
+    const shouldReuseOriginalSnapshot = originalSnapshot && !hasShopDiscountChanged;
+    const snapshotSummary = shouldReuseOriginalSnapshot ? this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder, originalSnapshot) : null;
     if (snapshotSummary)
       return snapshotSummary;
-    const shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+    const shouldFullRecalculateFromSnapshot = Boolean(originalSnapshot);
     const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, import_lodash_es.cloneDeep)(tempOrder.products || []) : tempOrder.products;
     if (shouldFullRecalculateFromSnapshot) {
       this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
@@ -2028,7 +2037,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const salesSummaryResult = await salesSummary.getSummary({
       products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
-      shopDiscount: tempOrder.shop_discount
+      shopDiscount: tempOrder.shop_discount,
+      ...((_a = this.otherParams) == null ? void 0 : _a.channel) ? { channel: this.otherParams.channel } : {}
     });
     if (shouldFullRecalculateFromSnapshot) {
       tempOrder.products = summaryProducts;
@@ -3947,6 +3957,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         products: (0, import_lodash_es.cloneDeep)(nextTempOrder.products || []),
         payments: (0, import_lodash_es.cloneDeep)(nextTempOrder.payments || []),
         surcharges: (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []),
+        shop_discount: nextTempOrder.shop_discount || "0.00",
         productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
       }
     };

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

@@ -9,16 +9,19 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private store;
     private request;
     private surchargeListModuleName;
+    private otherParams;
+    private surchargeListChannel;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
      *
      * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
      */
     updateOtherParams(params: Record<string, any>): Promise<void>;
-    getSurchargeList(): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(channel?: string): Promise<void>;
     private getAppData;
     private getTaxConfig;
     getSummary(params: {
@@ -26,6 +29,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         isPriceIncludeTax?: number;
         taxRate?: number;
         shopDiscount?: string | number;
+        channel?: string;
     }): Promise<{
         tax_title: string;
         tax_rate: number | undefined;

package/lib/modules/SalesSummary/index.js

@@ -33,12 +33,15 @@ var salesSummaryDataKeys = {
   taxTitle: "tax_title",
   taxCountryCode: "tax_country_code"
 };
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "salesSummary";
     this.defaultVersion = "1.0.0";
     this.surchargeListModuleName = "surchargeList";
+    this.otherParams = {};
+    this.surchargeListChannel = DEFAULT_SURCHARGE_CHANNEL;
   }
   async initialize(core, options) {
     var _a, _b, _c;
@@ -46,9 +49,10 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     this.store = options.store;
     this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
+    this.otherParams = options.otherParams || {};
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
-    this.surchargeListModuleName = ((_c = options.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
+    this.surchargeListModuleName = ((_c = this.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
     if (!this.appPlugin) {
       throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
@@ -58,41 +62,50 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     await this.getSurchargeList();
   }
   /**
-   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
    *
    * @example
-   * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+   * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
    */
   async updateOtherParams(params) {
+    const previousChannel = this.resolveChannel();
     const nextSurchargeListModuleName = (params == null ? void 0 : params.surchargeListModuleName) || "surchargeList";
-    if (nextSurchargeListModuleName === this.surchargeListModuleName)
-      return;
+    const nextChannel = this.resolveChannel(params);
+    const shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+    this.otherParams = params || {};
     this.surchargeListModuleName = nextSurchargeListModuleName;
-    await this.getSurchargeList();
+    if (shouldReload) {
+      await this.getSurchargeList(nextChannel);
+    }
   }
-  async getSurchargeList() {
+  resolveChannel(params = this.otherParams) {
+    return (params == null ? void 0 : params.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(channel = this.resolveChannel()) {
     try {
       const surchargeListModule = this.core.getModule(
         this.surchargeListModuleName
       );
       if (surchargeListModule == null ? void 0 : surchargeListModule.getSurchargeList) {
-        this.store.surchargeList = await surchargeListModule.getSurchargeList();
+        this.store.surchargeList = await surchargeListModule.getSurchargeList({ channel });
+        this.surchargeListChannel = channel;
         return;
       }
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          // TODO 真实的渠道
-          channel: "online-store",
+          channel,
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
       this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      this.surchargeListChannel = channel;
     } catch (error) {
       console.warn("[SalesSummaryModule] 加载附加费配置失败", error);
       this.store.surchargeList = [];
+      this.surchargeListChannel = channel;
     }
   }
   getAppData(key) {
@@ -114,7 +127,11 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   }
   async getSummary(params) {
     var _a, _b;
-    const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
+    const { products = [], isPriceIncludeTax, taxRate, shopDiscount, channel } = params;
+    const summaryChannel = channel || this.resolveChannel();
+    if (summaryChannel !== this.surchargeListChannel) {
+      await this.getSurchargeList(summaryChannel);
+    }
     const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(
       `${this.name.split("_")[0]}_schedule`

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

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

package/lib/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/lib/modules/SurchargeList/index.js

@@ -25,15 +25,17 @@ __export(SurchargeList_exports, {
 module.exports = __toCommonJS(SurchargeList_exports);
 var import_BaseModule = require("../BaseModule");
 __reExport(SurchargeList_exports, require("./types"), module.exports);
+var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SurchargeListModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "surchargeList";
     this.defaultVersion = "1.0.0";
-    this.loadingPromise = null;
+    this.loadingPromises = /* @__PURE__ */ new Map();
+    this.requestVersion = 0;
   }
   async initialize(core, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
@@ -41,44 +43,62 @@ var SurchargeListModule = class extends import_BaseModule.BaseModule {
       (_a = options.initialState) == null ? void 0 : _a.surchargeList
     );
     this.store.surchargeList = hasInitialSurchargeList ? (_b = options.initialState) == null ? void 0 : _b.surchargeList : [];
-    this.store.isLoaded = Boolean((_c = options.initialState) == null ? void 0 : _c.isLoaded) || hasInitialSurchargeList;
+    this.store.channel = ((_c = options.initialState) == null ? void 0 : _c.channel) || ((_d = options.otherParams) == null ? void 0 : _d.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    this.store.isLoaded = Boolean((_e = options.initialState) == null ? void 0 : _e.isLoaded) || hasInitialSurchargeList;
     if (!this.request) {
       throw new Error("SurchargeListModule 需要 request 插件支持");
     }
   }
-  async getSurchargeList() {
-    if (this.store.isLoaded)
+  resolveChannel(query) {
+    return (query == null ? void 0 : query.channel) || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    if (this.store.isLoaded && this.store.channel === channel) {
       return this.store.surchargeList;
-    if (this.loadingPromise)
-      return this.loadingPromise;
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+    }
+    const loadingPromise = this.loadingPromises.get(channel);
+    if (loadingPromise)
+      return loadingPromise;
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async refreshSurchargeList() {
-    this.loadingPromise = this.loadSurchargeList();
-    return this.loadingPromise;
+  async refreshSurchargeList(query) {
+    const channel = this.resolveChannel(query);
+    const nextPromise = this.loadSurchargeList(channel);
+    this.loadingPromises.set(channel, nextPromise);
+    return nextPromise;
   }
-  async loadSurchargeList() {
+  async loadSurchargeList(channel) {
+    const currentRequestVersion = ++this.requestVersion;
     try {
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          channel: "online-store",
+          channel,
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
-      this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      const nextSurchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = nextSurchargeList;
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return nextSurchargeList;
     } catch (error) {
       console.warn("[SurchargeListModule] 加载附加费配置失败", error);
-      this.store.surchargeList = [];
-      this.store.isLoaded = true;
-      return this.store.surchargeList;
+      if (currentRequestVersion === this.requestVersion) {
+        this.store.surchargeList = [];
+        this.store.channel = channel;
+        this.store.isLoaded = true;
+      }
+      return [];
     } finally {
-      this.loadingPromise = null;
+      this.loadingPromises.delete(channel);
     }
   }
 };

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

@@ -1696,15 +1696,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.discardPendingVoucherPayments();
   }
   getWalletProductList() {
-    var _a, _b, _c;
+    var _a, _b;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
-    const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
-    const walletProducts = products.map((product) => {
+    const walletProducts = tempOrder == null ? void 0 : tempOrder.products.map((product) => {
       const metadata = product.metadata || {};
+      const rawHolderId = product.holder_id ?? metadata.holder_id;
+      const holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
+      const holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : void 0;
       return {
-        product_id: product.product_id,
+        product_id: product.product_id || 0,
         product_variant_id: String(product.product_variant_id ?? ""),
         quantity: product.num || 1,
         is_price_include_tax: tempOrder.is_price_include_tax,
@@ -1712,7 +1714,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         tax_fee: product.tax_fee,
         selling_price: Number(product.selling_price || 0),
         discount_list: product.discount_list || [],
-        holder_id: product.holder_id ?? metadata.holder_id,
+        holder_id,
         original_price: product.original_price,
         main_product_original_price: metadata.main_product_original_price ?? product.original_price,
         main_product_selling_price: metadata.main_product_selling_price ?? product.selling_price,

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -88,7 +88,8 @@ function normalizeBundleItems(bundleItems, preferPriceField = false) {
       price: bundleItem.price ?? unitStr,
       bundle_selling_price: unitStr,
       original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
-      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     };
     normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {

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

@@ -441,19 +441,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",