@pisell/pisellos 0.0.183 → 0.0.184

package/dist/modules/Rules/index.js

@@ -348,7 +348,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         });
 
         // 选择第一个适用的优惠券（已经按过期时间排序）
-        var selectedDiscount = applicableDiscounts[0];
+        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
+        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
+        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+          return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
+        });
+        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || (product === null || product === void 0 || (_product$discount_lis7 = product.discount_list) === null || _product$discount_lis7 === void 0 || (_product$discount_lis8 = _product$discount_lis7.every) === null || _product$discount_lis8 === void 0 ? void 0 : _product$discount_lis8.call(_product$discount_lis7, function (item) {
@@ -418,7 +423,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _selectedDiscount = applicableDiscounts[_i];
+          // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
           usedDiscounts.set(_selectedDiscount.id, true);
 

package/lib/modules/Rules/index.js

@@ -229,7 +229,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscount = applicableDiscounts[0];
+      const selectedDiscountCard = applicableDiscounts.find((n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass");
+      const selectedDiscount = selectedDiscountCard || 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) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
         var _a2;
@@ -293,7 +294,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }));
       }
       for (let i2 = 0; i2 < splitCount; i2++) {
-        const selectedDiscount2 = applicableDiscounts[i2];
+        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         const productOriginTotal = product.origin_total || product.total || 0;

package/package.json

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