@pisell/pisellos 2.3.43 → 2.3.44

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

@@ -27,6 +27,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }): {
         isAvailable: boolean;
         discountList: Discount[];
+        /** 完整规则计算后的列表；调用方可用于保留暂时无适用商品的扫码卡券。 */
+        evaluatedDiscountList?: Discount[];
         productList: any[];
         unavailableReason?: UnavailableReason;
     };

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({
@@ -724,7 +728,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 +745,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 +771,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 +791,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 套餐规则检查
-        var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+        var isBundleAvailable = _this4.checkPackageSubItemUsageRules(discount, flatItem);
         return isLimitedProduct && isBundleAvailable;
       };
 
@@ -930,30 +934,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) {
@@ -1055,7 +1059,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 +1083,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 +1106,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 +1152,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 +1170,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 +1202,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 +1295,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 +1315,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 +1328,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 +1340,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 +1388,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 +1413,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
@@ -1497,7 +1501,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 +1519,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,
@@ -1601,7 +1605,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: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion'),
                 processed: true
               }));
             }
@@ -1671,7 +1675,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: _this4.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
               processed: true
             }));
           }
@@ -1683,7 +1687,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 +1696,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 +1718,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 +1767,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 +1885,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 +1957,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 +1970,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 +2057,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

package/dist/solution/BaseSales/index.js

@@ -2479,12 +2479,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder
               });
             case 13:
-              return _context23.abrupt("return", {
-                isAvailable: raw.isAvailable,
+              return _context23.abrupt("return", _objectSpread(_objectSpread({
+                isAvailable: raw.isAvailable
+              }, raw.isAccepted !== undefined ? {
+                isAccepted: raw.isAccepted
+              } : {}), {}, {
                 type: raw.type,
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
-              });
+              }));
             case 16:
               _context23.prev = 16;
               _context23.t0 = _context23["catch"](0);

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

@@ -439,8 +439,10 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
+    isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
     scannedDiscountList?: Discount[];
 }

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

@@ -104,7 +104,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -116,11 +116,14 @@ export function transformBaseProductToOrderProduct(params) {
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
-  var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
+  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
+  // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
+  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
+  var catalogSourcePrice = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price;
+  var sourceProductPrice = toPriceString(hasPriceOverride ? (_ref21 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref21 !== void 0 ? _ref21 : payload.selling_price : (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : catalogSourcePrice, '0.00');
   var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
   var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；

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

@@ -326,7 +326,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/BookingTicket/index.js

@@ -602,12 +602,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 tempOrder: tempOrder
               });
             case 18:
-              return _context7.abrupt("return", {
-                isAvailable: raw.isAvailable,
+              return _context7.abrupt("return", _objectSpread(_objectSpread({
+                isAvailable: raw.isAvailable
+              }, raw.isAccepted !== undefined ? {
+                isAccepted: raw.isAccepted
+              } : {}), {}, {
                 type: raw.type,
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
-              });
+              }));
             case 19:
             case "end":
               return _context7.stop();

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

@@ -229,6 +229,7 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number) => Promise<{
         isAvailable?: boolean;
+        isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;

package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -192,7 +192,7 @@ export function applyGlobalScan(_x14, _x15, _x16) {
 }
 function _applyGlobalScan() {
   _applyGlobalScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(host, formatted, bridge) {
-    var searchType, data, scanCode, _bridge$onNotify2, _bridge$onNotify, _host$refreshWalletAs, _bridge$onNotify5, snapshot, scannedCustomerIsWalkIn, trySelectWalletAsset, _walletSelection, result, walletSelection, _data$id, promotionResult, list, _bridge$onNotify6, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify7, _data$order_id, _data$business_code, orderId, _bridge$onNotify8;
+    var searchType, data, scanCode, _bridge$onNotify2, _bridge$onNotify, _host$refreshWalletAs, _bridge$onNotify5, snapshot, scannedCustomerIsWalkIn, trySelectWalletAsset, _result$isAccepted, _walletSelection, result, walletSelection, _data$id, _promotionResult$isAc, promotionResult, list, _bridge$onNotify6, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify7, _data$order_id, _data$business_code, orderId, _bridge$onNotify8;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
@@ -309,7 +309,7 @@ function _applyGlobalScan() {
           return bridge.applyPromotionCode(scanCode);
         case 22:
           result = _context5.sent;
-          if (!(result !== null && result !== void 0 && result.isAvailable)) {
+          if (!((_result$isAccepted = result === null || result === void 0 ? void 0 : result.isAccepted) !== null && _result$isAccepted !== void 0 ? _result$isAccepted : result === null || result === void 0 ? void 0 : result.isAvailable)) {
             _context5.next = 25;
             break;
           }
@@ -347,7 +347,7 @@ function _applyGlobalScan() {
           return bridge.applyPromotionCode(scanCode, Number((_data$id = data === null || data === void 0 ? void 0 : data.id) !== null && _data$id !== void 0 ? _data$id : data === null || data === void 0 ? void 0 : data.customer_id) || undefined);
         case 37:
           promotionResult = _context5.sent;
-          if (!(promotionResult !== null && promotionResult !== void 0 && promotionResult.isAvailable)) {
+          if (!((_promotionResult$isAc = promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAccepted) !== null && _promotionResult$isAc !== void 0 ? _promotionResult$isAc : promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAvailable)) {
             _context5.next = 40;
             break;
           }

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

@@ -167,6 +167,7 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     private recalculateOrderPricesFromQuotation;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean | undefined;
         discountList: import("../../modules/Discount").Discount[];
         type: "server" | "clientCalc";
         unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;