@pisell/pisellos 2.2.244 → 2.2.245

package/dist/modules/Quotation/index.js

@@ -78,22 +78,22 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
-              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 6;
+              _context2.next = 5;
               return this.request.get('/quotation/available', query, {
-                useCache: false
+                useCache: false,
+                osServer: true
               });
-            case 6:
+            case 5:
               res = _context2.sent;
-              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
+              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 10:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -130,8 +130,10 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
-          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
-          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
+          var visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
+          if (!visible) continue;
+          var active = this.isQuotationActiveAt(quotation, datetime);
+          if (!active) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
@@ -218,14 +220,6 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
-  }, {
-    key: "filterQuotationsByCustomer",
-    value: function filterQuotationsByCustomer(list, customerId) {
-      var _this2 = this;
-      return list.filter(function (quotation) {
-        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
-      });
-    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -246,18 +240,27 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this3 = this;
+        _this2 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
-      var scheduleItems = quotation.schedule.map(function (s) {
-        var _this3$scheduleResolv;
-        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
-        if (full) return full;
-        return _objectSpread(_objectSpread({}, s), {}, {
+      var scheduleItems = [];
+      quotation.schedule.forEach(function (s) {
+        var _this2$scheduleResolv;
+        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
+        if (full) {
+          scheduleItems.push(full);
+          return;
+        }
+        if (_this2.scheduleResolver) {
+          return;
+        }
+        var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {
           repeat_type: s.repeat_type || 'none',
           repeat_rule: s.repeat_rule || null,
           time_slot: s.time_slot || []
         });
+        scheduleItems.push(fallbackSchedule);
       });
+      if (!scheduleItems.length) return false;
       return getDateIsInSchedule(datetime, scheduleItems);
     }
   }, {

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

@@ -32,6 +32,10 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -18,6 +18,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -222,6 +224,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return item.type === type || item.tag === type;
       });
     }
+
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  }, {
+    key: "excludeDiscountListByType",
+    value: function excludeDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type !== type && item.tag !== type;
+      });
+    }
+
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  }, {
+    key: "resolveDiscountListForManualOverride",
+    value: function resolveDiscountListForManualOverride(discountList) {
+      return this.excludeDiscountListByType(discountList, 'promotion');
+    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -298,7 +316,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
-      var _this3 = this;
+      var _options$selectedList,
+        _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
@@ -344,6 +363,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var filteredDiscountList = addModeDiscount.filter(function (discount) {
         return !discount.isManualSelect;
       });
+      var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
+      if (!hasDiscountInput) {
+        return {
+          discountList: discountList,
+          productList: productList
+        };
+      }
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -760,7 +786,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
-      console.log('occupiedItems', occupiedItems, 'orderLevelDiscountApplicableItems', orderLevelDiscountApplicableItems);
 
       // 🔥 第三步：识别 order_level 折扣卡并预计算分摊（排除被其他专属折扣卡占用的商品）
       sortedDiscountList.forEach(function (discount) {
@@ -977,7 +1002,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _product$discount_lis2, _product11;
+        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1001,11 +1026,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isPersistedProduct = ((_product10 = product) === null || _product10 === void 0 ? void 0 : _product10.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
+        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 ? void 0 : _product11.every(function (discount) {
+          var _discount$id, _discount$discount4;
+          var discountIdentity = (_discount$id = discount.id) !== null && _discount$id !== void 0 ? _discount$id : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.resource_id;
+          var discountType = discount.tag || discount.type;
+          return Boolean(discountIdentity && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType));
+        }));
 
-        // 已有优惠的商品跳过
-        if ((_product10 = product) !== null && _product10 !== void 0 && _product10.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product11 = product) !== null && _product11 !== void 0 && (_product11 = _product11.discount_list) !== null && _product11 !== void 0 && _product11.every(function (discount) {
-          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
-        })) {
+        // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
+        if (isPersistedProduct && hasExistingWalletDiscount) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
           } else {
@@ -1100,12 +1130,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product12, _product12$every;
+          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
-          isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
+          isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
+            return item.type === 'product';
+          })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
             var _ref11;
             return !((_ref11 = item.discount_list || []) !== null && _ref11 !== void 0 && _ref11.length);
-          }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
+          }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
             return item.type === 'product';
           })));
           if (product.inPromotion) {
@@ -1115,11 +1147,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // bundle子商品：判断父主商品是否手动折扣
           var parentProduct = flatItem.parentProduct;
           if (parentProduct) {
-            var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
-            isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
+            var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3, _parentProduct$discou4;
+            isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
+              return item.type === 'product';
+            })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
               var _ref12;
               return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
-            }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
+            }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
           }
@@ -1127,9 +1161,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId) {
-          var _product$discount_lis6;
+          var _product$discount_lis7;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
+          if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
             var _item$discount;
             return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
           })) {
@@ -1137,8 +1171,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis7, _flatItem$parentProdu7;
-            if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
+            var _product$discount_lis8, _flatItem$parentProdu7;
+            if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
             }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
@@ -1150,11 +1184,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
         if (options !== null && options !== void 0 && options.selectedList) {
-          var _product$discount_lis8;
+          var _product$discount_lis9;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
-            var _options$selectedList;
-            return options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.some(function (n) {
+          if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
+            var _options$selectedList2;
+            return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
               var _item$discount4;
               return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
             });
@@ -1163,16 +1197,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis9, _flatItem$parentProdu8;
-            if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
-              var _options$selectedList2;
-              return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
+            var _product$discount_lis10, _flatItem$parentProdu8;
+            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
+              var _options$selectedList3;
+              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
-              var _options$selectedList3;
-              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
+              var _options$selectedList4;
+              return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
                 var _item$discount6;
                 return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
@@ -1208,7 +1242,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1231,14 +1265,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1286,7 +1320,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1307,7 +1341,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
-            if (Number(((_originProduct = originProduct) === null || _originProduct === void 0 || (_originProduct = _originProduct._productInit) === null || _originProduct === void 0 ? void 0 : _originProduct.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+            if (Number(((_originProduct4 = originProduct) === null || _originProduct4 === void 0 || (_originProduct4 = _originProduct4._productInit) === null || _originProduct4 === void 0 ? void 0 : _originProduct4.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
               productOriginTotal = product.total;
             }
 
@@ -1847,7 +1881,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1862,6 +1896,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
+                        var _item$price, _ref14, _item$bundle_selling_;
+                        var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
+                        var nextBundleSellingPrice = (_ref14 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -1876,18 +1913,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                         newBundle.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
                           _id: item._id,
                           product_id: bundleItem.product_id,
-                          price: item.price,
+                          price: nextBundlePrice,
                           num: item.num,
                           discount_list: updatedDiscountList,
-                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? item.price : undefined
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? nextBundleSellingPrice : undefined
                         }));
                       });
                     }
                   });
                 }
 
-                // 🔥 重新计算主商品的总价（包含bundle）
-                var newTotal = Number(mainProductData.price || 0);
+                // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
+                // 避免把主商品 discount_list 再扣一次。
+                var mainSellingPrice = (_ref15 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref15 !== void 0 ? _ref15 : 0;
+                var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
                 // 判断是否是手动折扣
@@ -1901,24 +1940,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   newTotal = (_mainProductData$tota = mainProductData.total) !== null && _mainProductData$tota !== void 0 ? _mainProductData$tota : newTotal;
                   newOriginTotal = (_mainProductData$orig3 = mainProductData.origin_total) !== null && _mainProductData$orig3 !== void 0 ? _mainProductData$orig3 : newOriginTotal;
                 } else {
-                  // 不是手动折扣时，才重新计算
-                  var _mainDiscountList = mainProductData.discount_list.filter(function (item) {
-                    var _item$metadata5;
-                    return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
-                  });
-
-                  // 如果主商品本身有折扣，需要重新计算主商品价格
-                  if (_mainDiscountList && _mainDiscountList.length > 0) {
-                    var _Decimal$minus$toNumb3, _mainProductData$orig4;
-                    var _allDiscountAmount2 = getDiscountListAmount(_mainDiscountList);
-                    newTotal = (_Decimal$minus$toNumb3 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount2).toNumber()) !== null && _Decimal$minus$toNumb3 !== void 0 ? _Decimal$minus$toNumb3 : newTotal;
-                    newOriginTotal = (_mainProductData$orig4 = mainProductData.origin_total) !== null && _mainProductData$orig4 !== void 0 ? _mainProductData$orig4 : newOriginTotal;
-                  }
-
-                  // 累加bundle的价格（只累加一次）
+                  // 累加 bundle 的折后价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      newTotal += Number(item.price) * Number(item.num);
+                      var _item$bundle_selling_2;
+                      var bundleSellingPrice = (_item$bundle_selling_2 = item.bundle_selling_price) !== null && _item$bundle_selling_2 !== void 0 ? _item$bundle_selling_2 : item.price;
+                      newTotal += Number(bundleSellingPrice) * Number(item.num);
                     });
 
                     // 计算原始总价（不考虑折扣）
@@ -2020,7 +2047,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           appliedProductDetails: []
         });
       });
-      console.log(processedProductList, 'processedProductList');
       return {
         productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))
@@ -2047,14 +2073,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref14 = packageScope || {},
-        scopeType = _ref14.type,
-        _ref14$exclude_bundle = _ref14.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref14$exclude_bundle === void 0 ? [] : _ref14$exclude_bundle,
-        _ref14$include_bundle = _ref14.include_bundle_product_ids,
-        include_bundle_product_ids = _ref14$include_bundle === void 0 ? [] : _ref14$include_bundle,
-        _ref14$filter = _ref14.filter,
-        filter = _ref14$filter === void 0 ? 0 : _ref14$filter;
+      var _ref16 = packageScope || {},
+        scopeType = _ref16.type,
+        _ref16$exclude_bundle = _ref16.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref16$exclude_bundle === void 0 ? [] : _ref16$exclude_bundle,
+        _ref16$include_bundle = _ref16.include_bundle_product_ids,
+        include_bundle_product_ids = _ref16$include_bundle === void 0 ? [] : _ref16$include_bundle,
+        _ref16$filter = _ref16.filter,
+        filter = _ref16$filter === void 0 ? 0 : _ref16$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 
@@ -2069,10 +2095,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
+          var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
           var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
           // original_price 对应：
@@ -2139,10 +2165,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
@@ -2242,7 +2268,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 3:
               console.log('[Rules] 已销毁');
-            case 4:
+              _get(_getPrototypeOf(RulesModule.prototype), "destroy", this).call(this);
+            case 5:
             case "end":
               return _context3.stop();
           }

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

@@ -53,6 +53,7 @@ type ProductDetail = {
     vouchersApplicable?: boolean;
     holder_id?: number;
     startDate?: any;
+    main_product_selling_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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

@@ -8,8 +8,16 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private appPlugin;
     private store;
     private request;
+    private surchargeListModuleName;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     */
+    updateOtherParams(params: Record<string, any>): Promise<void>;
     getSurchargeList(): Promise<void>;
     private getAppData;
     private getTaxConfig;
@@ -43,30 +51,5 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         rounding_amount: string;
         pay_service_charge_amount: string;
         is_price_include_tax?: number | undefined;
-    } | {
-        tax_title: string;
-        tax_rate: number | undefined;
-        product_quantity: number;
-        product_original_amount: string;
-        product_amount: string;
-        product_expect_amount: string;
-        product_tax_fee: string;
-        shipping_fee: string;
-        shipping_tax_fee: string;
-        tax_fee: string;
-        surcharge_fee: string;
-        surcharges: any;
-        discount_amount: string;
-        deposit_amount: string;
-        deposit: import("./types").DepositInfo | undefined;
-        expect_amount: string;
-        total_amount: string;
-        total_refund_amount: string;
-        customer_paid_amount: string;
-        order_paid_amount: string;
-        amount_gap: string;
-        rounding_amount: string;
-        pay_service_charge_amount: string;
-        is_price_include_tax: number;
     }>;
 }