@pisell/pisellos 2.0.38 → 2.0.40

package/dist/modules/ProductList/index.js

@@ -97,15 +97,78 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       return storeChange;
     }()
   }, {
-    key: "loadProductsPrice",
+    key: "loadProducts",
     value: function () {
-      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _ref$ids, ids, customer_id, schedule_date, channel, productsData;
+      var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, cacheId, userPlugin, customer_id, _userPlugin$get, productsData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _ref$ids = _ref.ids, ids = _ref$ids === void 0 ? [] : _ref$ids, customer_id = _ref.customer_id, schedule_date = _ref.schedule_date, channel = _ref.channel;
-              _context3.next = 3;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date, cacheId = _ref.cacheId;
+              // // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
+              // if (!schedule_ids?.length) {
+              //   const schedule_ids_data = this.store.schedule
+              //     .getScheduleListByIds(schedule_ids)
+              //     .map((n) => n.id);
+              //   if (schedule_ids_data.length) {
+              //     schedule_ids = schedule_ids_data;
+              //   } else if (schedule_date) {
+              //     // 后端说如果 schedule_ids 如果为空，需要给[0]
+              //     schedule_ids = [0];
+              //   }
+              // }
+              userPlugin = this.core.getPlugin('user');
+              customer_id = undefined;
+              try {
+                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get = userPlugin.get()) === null || _userPlugin$get === void 0 ? void 0 : _userPlugin$get.id;
+              } catch (error) {
+                console.error(error);
+              }
+              // 如果没传schedule_date，则从
+              _context3.next = 6;
+              return this.request.post("/product/query", {
+                open_quotation: 1,
+                open_bundle: 0,
+                exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
+                with: ['category', 'collection', 'resourceRelation'],
+                status: 'published',
+                num: 500,
+                skip: 1,
+                customer_id: customer_id,
+                category_ids: category_ids,
+                ids: product_ids,
+                collection: collection,
+                front_end_cache_id: cacheId,
+                // client_schedule_ids: schedule_ids,
+                schedule_date: schedule_date
+              }, {
+                useCache: true
+              });
+            case 6:
+              productsData = _context3.sent;
+              this.addProduct(productsData.data.list);
+              return _context3.abrupt("return", productsData.data.list);
+            case 9:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function loadProducts(_x5) {
+        return _loadProducts.apply(this, arguments);
+      }
+      return loadProducts;
+    }()
+  }, {
+    key: "loadProductsPrice",
+    value: function () {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref2) {
+        var _ref2$ids, ids, customer_id, schedule_date, channel, productsData;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _ref2$ids = _ref2.ids, ids = _ref2$ids === void 0 ? [] : _ref2$ids, customer_id = _ref2.customer_id, schedule_date = _ref2.schedule_date, channel = _ref2.channel;
+              _context4.next = 3;
               return this.request.post("/product/query/price", {
                 ids: ids,
                 customer_id: customer_id,
@@ -115,15 +178,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true
               });
             case 3:
-              productsData = _context3.sent;
-              return _context3.abrupt("return", productsData.data);
+              productsData = _context4.sent;
+              return _context4.abrupt("return", productsData.data);
             case 5:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function loadProductsPrice(_x5) {
+      function loadProductsPrice(_x6) {
         return _loadProductsPrice.apply(this, arguments);
       }
       return loadProductsPrice;
@@ -131,19 +194,19 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProducts",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.core.effects.emit(ProductListHooks.onGetProducts, this.store.list);
             case 2:
-              return _context4.abrupt("return", cloneDeep(this.store.list));
+              return _context5.abrupt("return", cloneDeep(this.store.list));
             case 3:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
@@ -153,29 +216,29 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
+              _context6.next = 2;
               return this.core.effects.emit(ProductListHooks.onGetProduct, this.store.list);
             case 2:
               product = this.store.productMap.get("".concat(id));
               if (!product) {
-                _context5.next = 5;
+                _context6.next = 5;
                 break;
               }
-              return _context5.abrupt("return", product);
+              return _context6.abrupt("return", product);
             case 5:
-              return _context5.abrupt("return", undefined);
+              return _context6.abrupt("return", undefined);
             case 6:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function getProduct(_x6) {
+      function getProduct(_x7) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -183,10 +246,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(products) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               // 加到 list 以后上面的storeChange 会自动初始化商品详情的 module 实例
               // list 需要根据 id 去重
@@ -206,11 +269,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.storeChange();
             case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function addProduct(_x7) {
+      function addProduct(_x8) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -218,18 +281,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(products) {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(products) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function selectProducts(_x8) {
+      function selectProducts(_x9) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

package/dist/modules/Rules/index.js

@@ -27,6 +27,7 @@ import { BaseModule } from "../BaseModule";
 import { RulesHooks } from "./types";
 import { uniqueById } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
+import Decimal from 'decimal.js';
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(RulesModule, _BaseModule);
   var _super = _createSuper(RulesModule);
@@ -106,8 +107,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
       }
 
-      // 合并新旧折扣列表，并计算折扣结果
-      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
+      // 编辑商品已有商品券
+      if (productList.every(function (item) {
+        var _item$discount_list;
+        return item.booking_id && (((_item$discount_list = item.discount_list) === null || _item$discount_list === void 0 ? void 0 : _item$discount_list.length) || item.price == 0);
+      })) {
+        return {
+          isAvailable: false,
+          discountList: oldDiscountList,
+          productList: productList
+        };
+      }
+
+      // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
+        return !discount.isEditMode && discount.tag !== 'good_pass';
+      });
+      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)
@@ -148,6 +164,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList;
+      // debugger
+
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = productList.find(function (n) {
+        return n.booking_id;
+      }) && productList.find(function (n) {
+        return !n.booking_id;
+      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -163,24 +188,69 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return !discount.isManualSelect;
       });
 
-      // 优惠券按过期时间排序（即将过期优先）
+      // 优惠力度排序，传进来的数据里可能有商品券，也可能有优惠券
+      // 商品券（n.tag=good_pass）视为最优惠（免费），折扣券（n.tag=product_discount_card）按照n.par_value排序
+      // 如果最后拍出来商品券有多个，或者说没有商品券，但是有多个相同折扣的折扣券（比如 6 折券有 3张），则按照过期时间(n.expire_time)排序
       var sortedDiscountList = _toConsumableArray(filteredDiscountList).sort(function (a, b) {
-        if (a.expire_time && b.expire_time) {
-          var timeA = new Date(a.expire_time).getTime();
-          var timeB = new Date(b.expire_time).getTime();
-          return timeA - timeB;
+        // 1. 商品券优先级最高
+        if (a.tag === 'good_pass' && b.tag !== 'good_pass') return -1;
+        if (b.tag === 'good_pass' && a.tag !== 'good_pass') return 1;
+
+        // 2. 如果都是商品券或都不是商品券，按照类型和折扣力度排序
+        if (a.tag === 'good_pass' && b.tag === 'good_pass') {
+          // 都是商品券，按照过期时间排序
+          return compareByExpireTime(a, b);
+        } else if (a.tag === 'product_discount_card' && b.tag === 'product_discount_card') {
+          // 都是折扣券，按照par_value排序（折扣越大越优先，即par_value越小越优先）
+          if (a.par_value !== b.par_value) {
+            var valueA = new Decimal(100).minus(a.par_value || 0);
+            var valueB = new Decimal(100).minus(b.par_value || 0);
+            return valueA.minus(valueB).toNumber();
+          }
+          // 相同折扣的情况下，按照过期时间排序
+          return compareByExpireTime(a, b);
+        }
+
+        // 3. 其他情况按照过期时间排序
+        return compareByExpireTime(a, b);
+        function compareByExpireTime(itemA, itemB) {
+          if (itemA.expire_time && itemB.expire_time) {
+            var timeA = new Date(itemA.expire_time).getTime();
+            var timeB = new Date(itemB.expire_time).getTime();
+            return timeA - timeB;
+          }
+          // 有过期时间的优先级高于永久的
+          return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
         }
-        // 有过期时间的优先级高于永久的
-        return a.expire_time ? -1 : b.expire_time ? 1 : 0;
       });
 
-      // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品）
+      // const newProductList = [];
+      //
+      // productList.forEach(item => {
+      //   const product = this.hooks.getProduct(item);
+      //   if (product.quantity > 1) {
+      //     for (let i = 1; i < product.quantity; i++) {
+      //       newProductList.push(product)
+      //     }
+      //   } else {
+      //     newProductList.push(item)
+      //   }
+      // })
+
+      // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
       var sortedProductList = _toConsumableArray(productList).sort(function (a, b) {
         var aProduct = _this3.hooks.getProduct(a);
         var bProduct = _this3.hooks.getProduct(b);
-        var priceA = parseFloat(aProduct.price || '0');
-        var priceB = parseFloat(bProduct.price || '0');
-        return priceB - priceA;
+        var priceA = new Decimal(aProduct.price || '0');
+        var priceB = new Decimal(bProduct.price || '0');
+        if (priceA.toNumber() === priceB.toNumber()) {
+          if (aProduct.quantity === bProduct.quantity) {
+            var _bProduct$discount_li, _aProduct$discount_li;
+            return ((_bProduct$discount_li = bProduct.discount_list) === null || _bProduct$discount_li === void 0 ? void 0 : _bProduct$discount_li.length) - ((_aProduct$discount_li = aProduct.discount_list) === null || _aProduct$discount_li === void 0 ? void 0 : _aProduct$discount_li.length);
+          }
+          return aProduct.quantity - bProduct.quantity;
+        }
+        return priceB.toNumber() - priceA.toNumber();
       });
 
       // 标记已使用的优惠券
@@ -216,7 +286,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id && discount.type === 'good_pass';
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -229,33 +299,41 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
             applicableProducts.push({
               amount: product.price,
-              type: discount.tag,
+              type: discount.tag || discount.type,
+              tag: discount.tag || discount.type,
               discount: {
                 resource_id: discount.id,
                 title: discount.format_title,
-                original_amount: product.origin_total
-              }
+                original_amount: product.origin_total,
+                pre_value: discount.par_value,
+                product_id: originProduct.id
+              },
+              num: product.num || 1
             });
             discountApplicableProducts.set(discount.id, applicableProducts);
           }
         });
       });
+      console.log(sortedProductList, 'sortedProductListsortedProductList');
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
-      sortedProductList.forEach(function (originProduct) {
-        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
+      sortedProductList.forEach(function (originProduct, i) {
+        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id && discount.type === 'good_pass';
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
         })) {
-          processedProductsMap.set(product._id, originProduct);
+          processedProductsMap.set(product._id, [originProduct]);
           return;
         }
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
+          // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
+          if (Number(product.price) === 0 || !product.price) return false;
           // 如果优惠券已被使用，则跳过
-          if (usedDiscounts.get(discount.id)) return false;
+          var targetUsedDiscounts = usedDiscounts.get(discount.id);
+          if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
@@ -276,14 +354,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {
+        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
+          var _item$discount;
+          return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
+        })) {
           isManualDiscount = false;
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (product.isClient) {
-            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+            processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
               origin_total: getProductOriginTotalPrice({
                 product: {
                   original_price: product.original_price
@@ -291,6 +372,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
+              variant: originProduct._productInit.variant,
+              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price
@@ -301,72 +384,98 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: product.price
             }), {}, {
               discount_list: []
-            })));
+            }))]);
           } else {
-            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+            processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              _id: product._id.split('___')[0] + '___' + i,
               total: product.origin_total || product.total,
               price: product.price
             }), {}, {
               discount_list: []
-            })));
+            }))]);
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
           return;
         }
 
-        // 标记优惠券为已使用
-        usedDiscounts.set(selectedDiscount.id, true);
-
-        // 记录实际应用了优惠券的商品信息
-        var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-        var discountDetail = {
-          amount: product.price,
-          type: selectedDiscount.tag,
-          discount: {
-            resource_id: selectedDiscount.id,
-            title: selectedDiscount.format_title,
-            original_amount: product.origin_total,
-            product_id: selectedDiscount.product_id
-          }
-        };
-        appliedProducts.push(discountDetail);
-        appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-
-        // 记录应用了优惠券的商品
-        // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
-        if (product.isClient) {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
-            discount_list: [discountDetail],
-            price: 0,
-            origin_total: getProductOriginTotalPrice({
-              product: {
-                original_price: product.original_price
-              },
-              bundle: product.bundle,
-              options: product.options
-            }),
-            total: getProductTotalPrice({
-              product: {
-                price: '0'
-              },
-              bundle: product.bundle,
-              options: product.options
-            })
-          }));
-        } else {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
-            discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
-            origin_total: product.origin_total || product.total
+        // 是否需要拆分
+        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
+
+        // 需要拆分出来的数量
+        var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, applicableDiscounts.filter(function (item) {
+          return (item.tag || item.type) === 'good_pass';
+        }).length) : 1;
+        var arr = [];
+        if (splitCount < product.quantity && isNeedSplit) {
+          arr.push(_this3.hooks.setProduct(originProduct, {
+            discount_list: [],
+            quantity: product.quantity - splitCount,
+            _id: product._id.split('___')[0]
           }));
         }
+        for (var _i = 0; _i < splitCount; _i++) {
+          var _selectedDiscount = applicableDiscounts[_i];
+          // 标记优惠券为已使用
+          usedDiscounts.set(_selectedDiscount.id, true);
+
+          // 记录实际应用了优惠券的商品信息
+          var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+
+          // 计算使用折扣卡/商品券以后，单个商品的总 total
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.origin_total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.origin_total || 0)).toNumber();
+          var discountDetail = {
+            amount: new Decimal(product.origin_total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
+            discount: {
+              resource_id: _selectedDiscount.id,
+              title: _selectedDiscount.format_title,
+              original_amount: product.origin_total,
+              product_id: originProduct.id,
+              percent: _selectedDiscount.par_value
+            },
+            num: product.num || 1
+          };
+          appliedProducts.push(discountDetail);
+          appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
+
+          // 记录应用了优惠券的商品
+          // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
+          if (product.isClient) {
+            arr.push(_this3.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
+              quantity: isNeedSplit ? 1 : product.quantity,
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              variant: originProduct._productInit.variant,
+              original_price: new Decimal(product.price || 0).toNumber(),
+              total: targetProductTotal
+            }));
+          } else {
+            arr.push(_this3.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
+              price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
+              quantity: isNeedSplit ? 1 : product.quantity,
+              total: targetProductTotal,
+              origin_total: product.origin_total || product.total
+            }));
+          }
+        }
+        console.log(arr, 'arrarrarr');
+        processedProductsMap.set(product._id, arr);
       });
 
       // 按原始顺序构建处理后的商品列表
-      var processedProductList = productList.map(function (originProduct) {
+      var processedProductList = [];
+      productList.forEach(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
         var getDefaultProduct = function getDefaultProduct() {
           if (product.isClient) {
@@ -380,6 +489,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
+              variant: originProduct._productInit.variant,
+              original_price: originProduct._productInit.original_price,
               total: getProductTotalPrice({
                 product: {
                   price: product.price
@@ -397,7 +508,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             });
           }
         };
-        return processedProductsMap.get(product._id) || getDefaultProduct();
+        var arr = processedProductsMap.get(product._id);
+        arr !== null && arr !== void 0 && arr.length ? processedProductList.push.apply(processedProductList, _toConsumableArray(arr)) : processedProductList.push(getDefaultProduct());
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券
@@ -430,6 +542,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (usedDiscounts.get(discount.id)) {
           return _objectSpread(_objectSpread({}, discount), {}, {
             isSelected: true,
+            isManualSelect: options !== null && options !== void 0 && options.scan ? false : discount.isManualSelect,
             // 标记为可用，因为它已被应用
             isAvailable: true,
             // 记录适用的商品IDs
@@ -452,6 +565,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 如果有适用的商品，标记为可用
           isAvailable: isAvailable,
           isSelected: isSelected,
+          // 如果是扫码进来的，要手动设置为手动选择：false
+          isManualSelect: options !== null && options !== void 0 && options.scan ? false : discount.isManualSelect,
           // 记录适用的商品IDs
           applicableProductIds: applicableProducts,
           // 添加可抵扣的商品详情
@@ -460,6 +575,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           appliedProductDetails: []
         });
       });
+      console.log(processedProductList, 'processedProductList');
       return {
         productList: processedProductList,
         discountList: [].concat(editModeDiscount, _toConsumableArray(updatedDiscountList))

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

@@ -37,14 +37,20 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
+    quantity: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
     setProduct: (product: Record<string, any>, values: {
+        _id?: string;
         total?: number;
         discount_list: any[];
         origin_total?: number;
-        price?: number;
+        price?: string | number;
+        variant?: any[];
+        original_price?: number;
+        quantity?: number;
     }) => Record<string, any>;
 }
 export {};