@pisell/pisellos 2.3.43 → 2.3.45

package/dist/modules/Rules/index.js

@@ -150,7 +150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 编辑商品已有商品券
-      if (productList.every(function (item) {
+      if (productList.length > 0 && productList.every(function (item) {
         var _product$discount_lis;
         var product = _this2.hooks.getProduct(item);
         return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || product.total == 0);
@@ -214,6 +214,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       return {
         isAvailable: hasApplicableDiscount,
         discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
+        evaluatedDiscountList: result.discountList,
         productList: hasApplicableDiscount ? result.productList : productList,
         unavailableReason: unavailableReason
       };
@@ -256,19 +257,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getUnavailableReason",
     value: function getUnavailableReason(discountList, productList) {
+      var _this3 = this;
       // 检查时间限制
       var _iterator = _createForOfIteratorHelper(discountList),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var discount = _step.value;
-          var _iterator3 = _createForOfIteratorHelper(productList),
+          var bookingTimes = productList.length ? productList.map(function (item) {
+            var product = _this3.hooks.getProduct(item);
+            return ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
+          }) : [dayjs().format('YYYY-MM-DD HH:mm:ss')];
+          var _iterator3 = _createForOfIteratorHelper(bookingTimes),
             _step3;
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var item = _step3.value;
-              var product = this.hooks.getProduct(item);
-              var bookingTime = ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
+              var bookingTime = _step3.value;
               var filteredList = filterDiscountListByBookingTime([discount], bookingTime);
               if (filteredList.length === 0) {
                 return UnavailableReason.TimeLimit;
@@ -299,12 +303,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           try {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _limitedData$product_;
-              var _item = _step4.value;
-              var _product = this.hooks.getProduct(_item);
+              var item = _step4.value;
+              var product = this.hooks.getProduct(item);
               if (limitedData.type === 'product_all') {
                 hasApplicableProduct = true;
                 break;
-              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(_product.id)) {
+              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(product.id)) {
                 hasApplicableProduct = true;
                 break;
               }
@@ -329,7 +333,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
       var _options$selectedList,
-        _this3 = this;
+        _this4 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
@@ -422,7 +426,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
         var flattened = [];
         productList.forEach(function (originProduct) {
-          var product = _this3.hooks.getProduct(originProduct);
+          var product = _this4.hooks.getProduct(originProduct);
 
           // 1. 添加主商品
           flattened.push({
@@ -434,8 +438,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num,
-            booking_id: product.booking_id
+            num: product.num
           });
 
           // 2. 展开 bundle 子商品
@@ -459,7 +462,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: bundleItem.booking_id,
+                booking_id: product.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -724,7 +727,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 辅助函数：检查商品是否对某个折扣卡可用
       var checkItemApplicableForDiscount = function checkItemApplicableForDiscount(flatItem, discount) {
-        var _product2, _product3, _product4, _flatItem$bundleItem, _flatItem$bundleItem2, _product5;
+        var _product, _product2, _product3, _flatItem$bundleItem, _flatItem$bundleItem2, _product4;
         var product;
         if (flatItem.type === 'main') {
           product = flatItem.product;
@@ -741,12 +744,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
-        if (_this3.isItemRewardProductDiscount(product)) {
+        if (_this4.isItemRewardProductDiscount(product)) {
           return false;
         }
 
         // 编辑的商品使用了优惠券不可用
-        var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
+        var isAvailableProduct = flatItem.type === 'main' ? !((_product = product) !== null && _product !== void 0 && _product.booking_id && (_product2 = product) !== null && _product2 !== void 0 && (_product2 = _product2.discount_list) !== null && _product2 !== void 0 && _product2.length && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.every(function (d) {
           return d.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type);
         })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.discount_list) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem2 = flatItem.bundleItem) !== null && _flatItem$bundleItem2 !== void 0 && (_flatItem$bundleItem2 = _flatItem$bundleItem2.discount_list) !== null && _flatItem$bundleItem2 !== void 0 && _flatItem$bundleItem2.every(function (d) {
           return d.id;
@@ -767,7 +770,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var limitedData = discount.limited_relation_product_data;
 
         // 时间限制检查
-        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product4 = product) === null || _product4 === void 0 ? void 0 : _product4.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -787,7 +790,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 套餐规则检查
-        var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+        var isBundleAvailable = _this4.checkPackageSubItemUsageRules(discount, flatItem);
         return isLimitedProduct && isBundleAvailable;
       };
 
@@ -930,30 +933,30 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
-        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+        var isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
-          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
-          var isHolderMatch = _this3.checkHolderMatch(discount, {
+          var isHolderMatch = _this4.checkHolderMatch(discount, {
             isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
           var isLimitedProduct = (limitedData.type === 'product_all' && limitedData.filter !== 1 || limitedData.type === 'product_all' && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
+          var isAvailableProduct = flatItem.type === 'main' ? !((_product6 = product) !== null && _product6 !== void 0 && _product6.booking_id && (_product7 = product) !== null && _product7 !== void 0 && (_product7 = _product7.discount_list) !== null && _product7 !== void 0 && _product7.length && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.every(function (discount) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem3 = flatItem.bundleItem) !== null && _flatItem$bundleItem3 !== void 0 && (_flatItem$bundleItem3 = _flatItem$bundleItem3.discount_list) !== null && _flatItem$bundleItem3 !== void 0 && _flatItem$bundleItem3.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem4 = flatItem.bundleItem) !== null && _flatItem$bundleItem4 !== void 0 && (_flatItem$bundleItem4 = _flatItem$bundleItem4.discount_list) !== null && _flatItem$bundleItem4 !== void 0 && _flatItem$bundleItem4.every(function (discount) {
             return discount.id;
           }));
 
           // 套餐是否可用判断
-          var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+          var isBundleAvailable = _this4.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
@@ -984,8 +987,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num,
-                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
+                num: num
               }
             };
             applicableProducts.push(productData);
@@ -1055,7 +1057,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
+        var _product9, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product10;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1079,8 +1081,8 @@ 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 isPersistedProduct = ((_product9 = product) === null || _product9 === void 0 ? void 0 : _product9.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) && ((_product10 = product) === null || _product10 === void 0 || (_product10 = _product10.discount_list) === null || _product10 === void 0 ? void 0 : _product10.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;
@@ -1102,7 +1104,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
-          if (_this3.isItemRewardProductDiscount(product)) return false;
+          if (_this4.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           var currentOriginUid = getOriginProductUid(originProduct);
@@ -1148,7 +1150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
-          var isHolderMatch = _this3.checkHolderMatch(discount, {
+          var isHolderMatch = _this4.checkHolderMatch(discount, {
             isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
@@ -1166,13 +1168,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               return false;
             }
             // 检查 package_sub_item_usage_rules
-            if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
+            if (!_this4.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
             }
             return true;
           } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
             // 检查 package_sub_item_usage_rules
-            if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
+            if (!_this4.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
             }
             return true;
@@ -1198,17 +1200,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var isManualDiscount = false;
         var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
+          var _product$discount_lis5, _product$discount_lis6, _product11, _product11$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) {
             var _ref12;
             return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.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_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
-          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+          isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
           if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
@@ -1291,7 +1293,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 主商品：保持原有逻辑，还原 option 价格
             var restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              processedProductsMap.set(product._id, [_this4.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 origin_total: getProductOriginTotalPrice({
                   product: {
                     original_price: product.original_price
@@ -1311,11 +1313,11 @@ 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: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref14, _product$_promotion$f, _product13, _product$origin_total;
-              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref14, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -1324,7 +1326,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
+              processedProductsMap.set(product._id, [_this4.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
                 price: product.price,
                 main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
               }, isItemRewardProductDiscount ? {
@@ -1336,14 +1338,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: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
             var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // 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: isManualDiscount ? _this4.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this4.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
             })]);
@@ -1384,8 +1386,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _product$total2;
               _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
             }
-            arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+            arr.push(_this4.hooks.setProduct(originProduct, {
+              discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
               total: _total
@@ -1409,7 +1411,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if (_this3.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
+            if (_this4.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1481,8 +1483,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread(_objectSpread({
-                num: 1,
-                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
+                num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               }), {}, {
@@ -1497,7 +1498,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
-              arr.push(_this3.hooks.setProduct(originProduct, {
+              arr.push(_this4.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
                 price: isGoodPass ? mainProductSellingPrice : product.price,
@@ -1515,8 +1516,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 options: discountedOptions
               }));
             } else {
-              arr.push(_this3.hooks.setProduct(originProduct, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
+              arr.push(_this4.hooks.setProduct(originProduct, {
+                discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
                 _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
@@ -1569,7 +1570,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
-                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1601,7 +1601,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: "".concat(flatItem._id, "_split_rest"),
                 num: normalNum,
                 quantity: normalNum,
-                discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion'),
+                discount_list: [],
                 processed: true
               }));
             }
@@ -1655,7 +1655,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
@@ -1671,7 +1670,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
+              discount_list: [_discountDetail2],
               processed: true
             }));
           }
@@ -1683,7 +1682,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var reconstructProductsWithBundle = function reconstructProductsWithBundle(processedProductsMap, processedFlatItemsMap, originalProductList) {
         var result = [];
         originalProductList.forEach(function (originProduct) {
-          var product = _this3.hooks.getProduct(originProduct);
+          var product = _this4.hooks.getProduct(originProduct);
 
           // 获取主商品处理结果
           var mainProductArr = processedProductsMap.get(product._id);
@@ -1692,8 +1691,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var getDefaultProduct = function getDefaultProduct() {
               var restoredOptions = restoreOptionPrices(product.options);
               if (product.isClient) {
-                return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                return _this4.hooks.setProduct(originProduct, {
+                  discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
                   price: product.price,
                   origin_total: getProductOriginTotalPrice({
                     product: {
@@ -1714,8 +1713,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   options: restoredOptions
                 });
               } else {
-                return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                return _this4.hooks.setProduct(originProduct, {
+                  discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
                   total: product.total,
                   origin_total: product.origin_total,
                   price: product.price,
@@ -1763,10 +1762,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }
 
             // 🔥 2. 如果有子商品应用了商品券，且主商品数量大于1，需要拆分主商品
-            var mainProductQuantity = mainProductArr[0] ? _this3.hooks.getProduct(mainProductArr[0]).quantity : 1;
+            var mainProductQuantity = mainProductArr[0] ? _this4.hooks.getProduct(mainProductArr[0]).quantity : 1;
             if (hasGoodPassApplied && mainProductArr.length === 1 && mainProductQuantity > 1) {
               var mainProduct = mainProductArr[0];
-              var mainProductData = _this3.hooks.getProduct(mainProduct);
+              var mainProductData = _this4.hooks.getProduct(mainProduct);
 
               // 🔥 方案：拆分成2个主商品
               // 1. 一个主商品(qty=1)包含拆分后的bundle
@@ -1881,7 +1880,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 添加第一个主商品：qty=1，包含拆分后的bundle
-              result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+              result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                 _id: "".concat(mainProductData._id.split('___')[0], "___split_discount"),
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
@@ -1953,7 +1952,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 newOriginTotalOriginal = new Decimal(newOriginTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 添加第二个主商品：qty=原quantity-1，包含原始bundle
-                result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+                result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                   _id: "".concat(mainProductData._id.split('___')[0], "___split_normal"),
                   quantity: mainProductQuantity - 1,
                   discount_list: updatedMainDiscountListOriginal,
@@ -1966,7 +1965,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
                 var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
-                var mainProductData = _this3.hooks.getProduct(mainProduct);
+                var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
                 var newBundle = [];
@@ -2053,7 +2052,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 生成最终的主商品
-                result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+                result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                   bundle: newBundle,
                   total: newTotal,
                   origin_total: newOriginTotal
@@ -2146,7 +2145,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
-      var _flatItem$product;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2168,7 +2166,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
-      var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2211,13 +2208,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2267,42 +2264,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            var _isOriginalPrice3 = _isOriginalPrice2 && rules.includes('original_price');
-            var _isMarkupPrice3 = _isMarkupPrice2 && rules.includes('markup_price');
-            // 价格是否符合规则：原价或加价
-            var _isPriceValid = _isOriginalPrice3 || _isMarkupPrice3;
-            // 套餐适用范围校验
-            var _isScopeValid = false;
-
-            // 排除套餐判断, product_all值兼容旧数据
-            if (scopeType === 'all_packages' || scopeType === 'product_all') {
-              // 所有套餐可用
-              if (!filter) {
-                _isScopeValid = true;
-              } else {
-                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
-              }
-            }
-
-            // 包含套餐判断, products值兼容旧数据
-            if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
-            }
-
-            // 价格和套餐适用范围都符合，则可用
-            if (_isPriceValid && _isScopeValid) {
+            // 检查原价
+            if (_isOriginalPrice2 && rules.includes('original_price')) {
               return true;
             }
 
-            // 检查原价
-            // if (isOriginalPrice && rules.includes('original_price')) {
-            //   return true;
-            // }
-
             // 检查加价
-            // if (isMarkupPrice && rules.includes('markup_price')) {
-            //   return true;
-            // }
+            if (_isMarkupPrice2 && rules.includes('markup_price')) {
+              return true;
+            }
 
             // 如果都不匹配，则不可用
             return false;

package/dist/modules/SalesSummary/index.js

@@ -64,19 +64,21 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               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 = ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.surchargeListModuleName) || 'surchargeList';
-
-              // if (!this.appPlugin) {
-              //   throw new Error('SalesSummaryModule 需要 app 插件支持');
-              // }
-              if (this.request) {
+              if (this.appPlugin) {
                 _context.next = 10;
                 break;
               }
-              throw new Error('SalesSummaryModule 需要 request 插件支持');
+              throw new Error('SalesSummaryModule 需要 app 插件支持');
             case 10:
-              _context.next = 12;
-              return this.getSurchargeList();
+              if (this.request) {
+                _context.next = 12;
+                break;
+              }
+              throw new Error('SalesSummaryModule 需要 request 插件支持');
             case 12:
+              _context.next = 14;
+              return this.getSurchargeList();
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -190,11 +192,10 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAppData",
     value: function getAppData(key) {
-      var _this$appPlugin, _this$appPlugin$getDa, _this$appPlugin2, _this$appPlugin2$getA, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
-      var getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+      var _this$appPlugin$getDa, _this$appPlugin, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
+      var getData = (_this$appPlugin$getDa = (_this$appPlugin = this.appPlugin).getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
       if (typeof getData === 'function') return getData(key);
-      var app = (_this$appPlugin2 = this.appPlugin) === null || _this$appPlugin2 === void 0 || (_this$appPlugin2$getA = _this$appPlugin2.getApp) === null || _this$appPlugin2$getA === void 0 ? void 0 : _this$appPlugin2$getA.call(_this$appPlugin2);
-      if (!app) return undefined;
+      var app = this.appPlugin.getApp();
       var coreData = app === null || app === void 0 || (_app$models = app.models) === null || _app$models === void 0 || (_app$models$getStore = _app$models.getStore) === null || _app$models$getStore === void 0 || (_app$models$getStore$ = (_app$models$getStore$2 = _app$models$getStore.call(_app$models)).getDataByModel) === null || _app$models$getStore$ === void 0 ? void 0 : _app$models$getStore$.call(_app$models$getStore$2, 'core', 'core');
       return coreData === null || coreData === void 0 ? void 0 : coreData[key];
     }

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

@@ -11,12 +11,10 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
-    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
-    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }