@pisell/pisellos 2.2.243 → 2.2.244

package/dist/modules/Rules/index.js

@@ -222,22 +222,6 @@ 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",
@@ -314,8 +298,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
-      var _options$selectedList,
-        _this3 = this;
+      var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
@@ -361,13 +344,6 @@ 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) {
@@ -784,6 +760,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
+      console.log('occupiedItems', occupiedItems, 'orderLevelDiscountApplicableItems', orderLevelDiscountApplicableItems);
 
       // 🔥 第三步：识别 order_level 折扣卡并预计算分摊（排除被其他专属折扣卡占用的商品）
       sortedDiscountList.forEach(function (discount) {
@@ -1000,7 +977,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
+        var _product10, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1024,16 +1001,11 @@ 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 (isPersistedProduct && hasExistingWalletDiscount) {
+        // 已有优惠的商品跳过
+        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 (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
           } else {
@@ -1128,14 +1100,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
+          var _product$discount_lis5, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
-          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) {
+          isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : 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_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) {
+          }) && (!((_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) {
             return item.type === 'product';
           })));
           if (product.inPromotion) {
@@ -1145,13 +1115,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // bundle子商品：判断父主商品是否手动折扣
           var parentProduct = flatItem.parentProduct;
           if (parentProduct) {
-            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 _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
+            isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
               var _ref12;
               return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
-            }) && (!((_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) {
+            }) && (!((_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) {
               return item.type === 'product';
             })));
           }
@@ -1159,9 +1127,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId) {
-          var _product$discount_lis7;
+          var _product$discount_lis6;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
+          if (flatItem.type === 'main' && (_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
             var _item$discount;
             return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
           })) {
@@ -1169,8 +1137,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            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 _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 _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) {
@@ -1182,11 +1150,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
         if (options !== null && options !== void 0 && options.selectedList) {
-          var _product$discount_lis9;
+          var _product$discount_lis8;
           // 主商品：检查自己的 discount_list
-          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) {
+          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) {
               var _item$discount4;
               return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
             });
@@ -1195,16 +1163,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            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 _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 _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$selectedList4;
-              return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
+              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$discount6;
                 return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
@@ -1240,7 +1208,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1263,14 +1231,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8, _flatItem$bundleItem9;
+            var _flatItem$bundleItem8;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              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'),
+              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1318,7 +1286,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1339,7 +1307,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，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) {
+            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) {
               productOriginTotal = product.total;
             }
 
@@ -1879,7 +1847,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1894,9 +1862,6 @@ 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;
@@ -1911,20 +1876,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                         newBundle.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
                           _id: item._id,
                           product_id: bundleItem.product_id,
-                          price: nextBundlePrice,
+                          price: item.price,
                           num: item.num,
                           discount_list: updatedDiscountList,
-                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? nextBundleSellingPrice : undefined
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? item.price : undefined
                         }));
                       });
                     }
                   });
                 }
 
-                // 主商品已经在前面的 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);
+                // 🔥 重新计算主商品的总价（包含bundle）
+                var newTotal = Number(mainProductData.price || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
                 // 判断是否是手动折扣
@@ -1938,12 +1901,24 @@ 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 {
-                  // 累加 bundle 的折后价格（只累加一次）
+                  // 不是手动折扣时，才重新计算
+                  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的价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      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);
+                      newTotal += Number(item.price) * Number(item.num);
                     });
 
                     // 计算原始总价（不考虑折扣）
@@ -2045,6 +2020,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           appliedProductDetails: []
         });
       });
+      console.log(processedProductList, 'processedProductList');
       return {
         productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))
@@ -2071,14 +2047,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      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 _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 isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
 
@@ -2093,10 +2069,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          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;
+          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;
           // 主商品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 对应：
@@ -2163,10 +2139,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem12, _flatItem$bundleItem13;
+          var _flatItem$bundleItem11, _flatItem$bundleItem12;
           // 套餐中购买时，判断是否为原价
-          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;
+          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;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

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

@@ -53,7 +53,6 @@ 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,16 +8,8 @@ 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;
@@ -51,5 +43,30 @@ 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;
     }>;
 }

package/dist/modules/SalesSummary/index.js

@@ -27,8 +27,7 @@ export * from "./types";
 var salesSummaryDataKeys = {
   isPriceIncludeTax: 'is_price_include_tax',
   taxRate: 'tax_rate',
-  taxTitle: 'tax_title',
-  taxCountryCode: 'tax_country_code'
+  taxTitle: 'tax_title'
 };
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
@@ -42,14 +41,13 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
-    _defineProperty(_assertThisInitialized(_this), "surchargeListModuleName", 'surchargeList');
     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;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -59,22 +57,21 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               this.request = this.core.getPlugin('request');
               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';
               if (this.appPlugin) {
-                _context.next = 9;
+                _context.next = 8;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 app 插件支持');
-            case 9:
+            case 8:
               if (this.request) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 request 插件支持');
-            case 11:
-              _context.next = 13;
+            case 10:
+              _context.next = 12;
               return this.getSurchargeList();
-            case 13:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -85,84 +82,37 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
-    /**
-     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
-     *
-     * @example
-     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
-     */
-  }, {
-    key: "updateOtherParams",
-    value: (function () {
-      var _updateOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var nextSurchargeListModuleName;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              nextSurchargeListModuleName = (params === null || params === void 0 ? void 0 : params.surchargeListModuleName) || 'surchargeList';
-              if (!(nextSurchargeListModuleName === this.surchargeListModuleName)) {
-                _context2.next = 3;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 3:
-              this.surchargeListModuleName = nextSurchargeListModuleName;
-              _context2.next = 6;
-              return this.getSurchargeList();
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function updateOtherParams(_x3) {
-        return _updateOtherParams.apply(this, arguments);
-      }
-      return updateOtherParams;
-    }())
   }, {
     key: "getSurchargeList",
     value: function () {
-      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var surchargeListModule, surchargeList;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var surchargeList;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context3.prev = 0;
-              surchargeListModule = this.core.getModule(this.surchargeListModuleName);
-              if (!(surchargeListModule !== null && surchargeListModule !== void 0 && surchargeListModule.getSurchargeList)) {
-                _context3.next = 7;
-                break;
-              }
-              _context3.next = 5;
-              return surchargeListModule.getSurchargeList();
-            case 5:
-              this.store.surchargeList = _context3.sent;
-              return _context3.abrupt("return");
-            case 7:
-              _context3.next = 9;
+              _context2.prev = 0;
+              _context2.next = 3;
               return this.request.get('/order/custom-surcharge/available/v2', {
-                // TODO 真实的渠道
                 channel: 'online-store',
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
                 with: ['relationSchedule']
               });
-            case 9:
-              surchargeList = _context3.sent;
+            case 3:
+              surchargeList = _context2.sent;
               this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              _context3.next = 17;
+              _context2.next = 11;
               break;
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](0);
-              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context3.t0);
+            case 7:
+              _context2.prev = 7;
+              _context2.t0 = _context2["catch"](0);
+              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context2.t0);
               this.store.surchargeList = [];
-            case 17:
+            case 11:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this, [[0, 13]]);
+        }, _callee2, this, [[0, 7]]);
       }));
       function getSurchargeList() {
         return _getSurchargeList.apply(this, arguments);
@@ -185,25 +135,24 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       return {
         isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
         taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-        taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
-        taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+        taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
       };
     }
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _this$store$surcharge, _ref;
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var _ref;
         var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount;
               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) {
+              needScheduleIds = this.store.surchargeList.map(function (item) {
                 return item.available_schedule_ids;
-              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat();
+              }).flat();
               scheduleList = summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
               scheduleById = {};
               if (Array.isArray(scheduleList)) {
@@ -233,14 +182,14 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
                 tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate
               });
               this.store.summary = summaryWithTaxMeta;
-              return _context4.abrupt("return", summaryWithTaxMeta);
+              return _context3.abrupt("return", summaryWithTaxMeta);
             case 11:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function getSummary(_x4) {
+      function getSummary(_x3) {
         return _getSummary.apply(this, arguments);
       }
       return getSummary;