@pisell/pisellos 0.0.148 → 0.0.150

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

@@ -28,6 +28,13 @@ interface ApplicableProductDetails {
     title: string;
     original_amount: string;
     num: number;
+    discount?: {
+        product_id?: number;
+        original_amount?: string;
+        percent?: string;
+        resource_id?: number;
+        title?: string;
+    };
 }
 export interface Discount {
     id: number;

package/dist/modules/Rules/index.js

@@ -200,13 +200,33 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
       });
 
-      // 对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 = new Decimal(aProduct.price || '0');
         var priceB = new Decimal(bProduct.price || '0');
-        return priceB.minus(priceA).toNumber();
+        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();
       });
 
       // 标记已使用的优惠券
@@ -242,7 +262,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 && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
+            return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag);
           }));
 
           // 判断优惠券是否适用于该商品
@@ -260,7 +280,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.origin_total,
-                pre_value: discount.par_value
+                pre_value: discount.par_value,
+                product_id: originProduct.id
               },
               num: product.num || 1
             });
@@ -268,15 +289,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      console.log(sortedProductList, 'sortedProductListsortedProductList');
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
-      sortedProductList.forEach(function (originProduct) {
+      sortedProductList.forEach(function (originProduct, i) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7;
         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 && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.type);
+          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag);
         })) {
-          processedProductsMap.set(product._id, originProduct);
+          processedProductsMap.set(product._id, [originProduct]);
           return;
         }
 
@@ -286,7 +308,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           if (Number(product.price) === 0 || !product.price) return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
-          if (targetUsedDiscounts && discount.type === 'good_pass') return false;
+          if (targetUsedDiscounts && discount.tag === 'good_pass') return false;
           var limitedData = discount.limited_relation_product_data;
 
           // 判断优惠券是否适用于该商品
@@ -307,14 +329,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_list.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
@@ -332,14 +357,15 @@ 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;
         }
@@ -347,60 +373,80 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return;
         }
 
-        // 标记优惠券为已使用
-        usedDiscounts.set(selectedDiscount.id, true);
-
-        // 记录实际应用了优惠券的商品信息
-        var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-        var targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
-        var discountDetail = {
-          amount: selectedDiscount.tag === 'product_discount_card' ? new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber() : product.price,
-          type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
-          discount: {
-            resource_id: selectedDiscount.id,
-            title: selectedDiscount.format_title,
-            original_amount: product.price,
-            product_id: selectedDiscount.product_id,
-            percent: selectedDiscount.par_value
-          },
-          num: product.num || 1
-        };
-        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: new Decimal(targetProductPrice).toNumber(),
-            origin_total: getProductOriginTotalPrice({
-              product: {
-                original_price: product.original_price
-              },
-              bundle: product.bundle,
-              options: product.options
-            }),
-            total: getProductTotalPrice({
-              product: {
-                price: targetProductPrice
-              },
-              bundle: product.bundle,
-              options: product.options
-            })
-          }));
-        } else {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, {
-            discount_list: [discountDetail],
-            price: new Decimal(targetProductPrice).toNumber(),
-            total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
-            origin_total: product.origin_total || product.total
+        // 需要拆分出来的数量
+        var splitCount = Math.min(product.quantity, applicableDiscounts.length);
+        debugger;
+        var arr = [];
+        if (splitCount < product.quantity) {
+          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) || [];
+          var targetProductPrice = _selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
+          var discountDetail = {
+            amount: _selectedDiscount.tag === 'product_discount_card' ? new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber() : product.price,
+            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: new Decimal(targetProductPrice).toNumber(),
+              quantity: 1,
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: targetProductPrice
+                },
+                bundle: product.bundle,
+                options: product.options
+              })
+            }));
+          } else {
+            arr.push(_this3.hooks.setProduct(originProduct, {
+              discount_list: [discountDetail],
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
+              price: new Decimal(targetProductPrice).toNumber(),
+              quantity: 1,
+              total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
+              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) {
@@ -431,7 +477,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             });
           }
         };
-        return processedProductsMap.get(product._id) || getDefaultProduct();
+        var arr = processedProductsMap.get(product._id);
+        arr.length ? processedProductList.push.apply(processedProductList, _toConsumableArray(arr)) : processedProductList.push(getDefaultProduct());
       });
 
       // 按原始顺序更新优惠券列表，标记已使用和可用的优惠券
@@ -494,6 +541,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

@@ -38,14 +38,17 @@ type ProductDetail = {
     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;
+        quantity?: number;
     }) => Record<string, any>;
 }
 export {};

package/dist/solution/ShopDiscount/index.js

@@ -28,6 +28,7 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
+import Decimal from 'decimal.js';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -447,10 +448,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               if (index !== -1) {
                 editModeDiscountList[index] = _objectSpread(_objectSpread({}, editModeDiscountList[index]), {}, {
-                  amount: discount.amount + editModeDiscountList[index].amount
+                  amount: new Decimal(discount.amount || 0).plus(new Decimal(editModeDiscountList[index].amount || 0)).toNumber(),
+                  savedAmount: new Decimal(discount.amount || 0).times((product === null || product === void 0 ? void 0 : product.num) || 1).plus(new Decimal(editModeDiscountList[index].savedAmount || 0)).toNumber()
                 });
               } else {
                 var _discount$discount2, _discount$discount3, _discount$discount4;
+                if (discount.type && !discount.tag) {
+                  discount.tag = discount.type;
+                }
                 editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                   isEditMode: true,
                   limited_relation_product_data: {},
@@ -471,7 +476,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return !item.isDisabled;
       })));
       var allUsedProductIds = newDiscountList.map(function (n) {
-        return n.isSelected ? n.applicableProductIds : [];
+        var _n$appliedProductDeta;
+        return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
+          var _n$discount;
+          return (_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.product_id;
+        }) : [];
       }).flat();
       newDiscountList.forEach(function (item) {
         var _item$applicableProdu;

package/lib/modules/Discount/types.d.ts

@@ -28,6 +28,13 @@ interface ApplicableProductDetails {
     title: string;
     original_amount: string;
     num: number;
+    discount?: {
+        product_id?: number;
+        original_amount?: string;
+        percent?: string;
+        resource_id?: number;
+        title?: string;
+    };
 }
 export interface Discount {
     id: number;

package/lib/modules/Rules/index.js

@@ -143,11 +143,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
     });
     const sortedProductList = [...productList].sort((a, b) => {
+      var _a, _b;
       const aProduct = this.hooks.getProduct(a);
       const bProduct = this.hooks.getProduct(b);
       const priceA = new import_decimal.default(aProduct.price || "0");
       const priceB = new import_decimal.default(bProduct.price || "0");
-      return priceB.minus(priceA).toNumber();
+      if (priceA.toNumber() === priceB.toNumber()) {
+        if (aProduct.quantity === bProduct.quantity) {
+          return ((_a = bProduct.discount_list) == null ? void 0 : _a.length) - ((_b = aProduct.discount_list) == null ? void 0 : _b.length);
+        }
+        return aProduct.quantity - bProduct.quantity;
+      }
+      return priceB.toNumber() - priceA.toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -164,7 +171,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.type))));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag))));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -175,7 +182,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.origin_total,
-              pre_value: discount.par_value
+              pre_value: discount.par_value,
+              product_id: originProduct.id
             },
             num: product.num || 1
           });
@@ -183,18 +191,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       });
     });
-    sortedProductList.forEach((originProduct) => {
+    console.log(sortedProductList, "sortedProductListsortedProductList");
+    sortedProductList.forEach((originProduct, i) => {
       var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.type)))) {
-        processedProductsMap.set(product._id, originProduct);
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag)))) {
+        processedProductsMap.set(product._id, [originProduct]);
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
         if (Number(product.price) === 0 || !product.price)
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
-        if (targetUsedDiscounts && discount.type === "good_pass")
+        if (targetUsedDiscounts && discount.tag === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
         if (limitedData.type === "product_all") {
@@ -206,14 +215,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
       const selectedDiscount = applicableDiscounts[0];
       let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
-      if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
+      if ((options == null ? void 0 : options.discountId) && product.discount_list.some((item) => {
+        var _a2;
+        return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+      })) {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (product.isClient) {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
@@ -232,18 +244,19 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         } else {
           processedProductsMap.set(
             product._id,
-            this.hooks.setProduct(originProduct, {
+            [this.hooks.setProduct(originProduct, {
               ...isManualDiscount ? {} : {
+                _id: product._id.split("___")[0] + "___" + i,
                 total: product.origin_total || product.total,
                 price: product.price
               },
               discount_list: []
-            })
+            })]
           );
         }
         return;
@@ -251,29 +264,40 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
         return;
       }
-      usedDiscounts.set(selectedDiscount.id, true);
-      const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-      const targetProductPrice = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
-      const discountDetail = {
-        amount: selectedDiscount.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
-        type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : selectedDiscount.tag,
-        discount: {
-          resource_id: selectedDiscount.id,
-          title: selectedDiscount.format_title,
-          original_amount: product.price,
-          product_id: selectedDiscount.product_id,
-          percent: selectedDiscount.par_value
-        },
-        num: product.num || 1
-      };
-      appliedProducts.push(discountDetail);
-      appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
-      if (product.isClient) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+      const splitCount = Math.min(product.quantity, applicableDiscounts.length);
+      debugger;
+      const arr = [];
+      if (splitCount < product.quantity) {
+        arr.push(this.hooks.setProduct(originProduct, {
+          discount_list: [],
+          quantity: product.quantity - splitCount,
+          _id: product._id.split("___")[0]
+        }));
+      }
+      for (let i2 = 0; i2 < splitCount; i2++) {
+        const selectedDiscount2 = applicableDiscounts[i2];
+        usedDiscounts.set(selectedDiscount2.id, true);
+        const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+        const targetProductPrice = selectedDiscount2.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
+        const discountDetail = {
+          amount: selectedDiscount2.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+          type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+          discount: {
+            resource_id: selectedDiscount2.id,
+            title: selectedDiscount2.format_title,
+            original_amount: product.origin_total,
+            product_id: originProduct.id,
+            percent: selectedDiscount2.par_value
+          },
+          num: product.num || 1
+        };
+        appliedProducts.push(discountDetail);
+        appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+        if (product.isClient) {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             price: new import_decimal.default(targetProductPrice).toNumber(),
+            quantity: 1,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -288,21 +312,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             })
-          })
-        );
-      } else {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
+          }));
+        } else {
+          arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
+            _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
             price: new import_decimal.default(targetProductPrice).toNumber(),
+            quantity: 1,
             total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice))).toNumber(),
             origin_total: product.origin_total || product.total
-          })
-        );
+          }));
+        }
       }
+      console.log(arr, "arrarrarr");
+      processedProductsMap.set(product._id, arr);
     });
-    const processedProductList = productList.map((originProduct) => {
+    const processedProductList = [];
+    productList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       const getDefaultProduct = () => {
         if (product.isClient) {
@@ -333,7 +359,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           });
         }
       };
-      return processedProductsMap.get(product._id) || getDefaultProduct();
+      const arr = processedProductsMap.get(product._id);
+      arr.length ? processedProductList.push(...arr) : processedProductList.push(getDefaultProduct());
     });
     const updatedDiscountList = addModeDiscount.map((discount) => {
       const applicableProducts = discountApplicability.get(discount.id) || [];
@@ -386,6 +413,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProductDetails: []
       };
     });
+    console.log(processedProductList, "processedProductList");
     return {
       productList: processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]

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

@@ -38,14 +38,17 @@ type ProductDetail = {
     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;
+        quantity?: number;
     }) => Record<string, any>;
 }
 export {};

package/lib/solution/ShopDiscount/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/ShopDiscount/index.ts
@@ -27,6 +37,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
+var import_decimal = __toESM(require("decimal.js"));
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -283,9 +294,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
             if (index !== -1) {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
-                amount: discount.amount + editModeDiscountList[index].amount
+                amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
+              if (discount.type && !discount.tag) {
+                discount.tag = discount.type;
+              }
               editModeDiscountList.push({
                 ...discount,
                 isEditMode: true,
@@ -307,7 +322,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       ...editModeDiscountList,
       ...discountList.filter((item) => !item.isDisabled)
     ];
-    const allUsedProductIds = newDiscountList.map((n) => n.isSelected ? n.applicableProductIds : []).flat();
+    const allUsedProductIds = newDiscountList.map((n) => {
+      var _a2;
+      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+        var _a3;
+        return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
+      }) : [];
+    }).flat();
     newDiscountList.forEach((item) => {
       var _a2;
       const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.148",
+  "version": "0.0.150",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",