@pisell/pisellos 1.0.21 → 1.0.22

package/dist/solution/ShopDiscount/index.js

@@ -507,7 +507,15 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           return Number(product === null || product === void 0 ? void 0 : product.price) === 0;
         };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
-          return (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
+          var _item$applicableProdu2;
+          // 检查当前 id是否在 item.applicableProductIds 里出现了几次，且要求次数和 item.applicableProductIds 里出现的次数一致
+          var sameIdTimes = ((_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.filter(function (n) {
+            return n === id;
+          }).length) || 1;
+          var targetIdTimes = (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.filter(function (n) {
+            return n === id;
+          }).length) || 1;
+          return targetIdTimes >= sameIdTimes && (allUsedProductIds === null || allUsedProductIds === void 0 ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
         });
         if (!item.isSelected && isAllProductUsedOrFree) {
           item.isDisabledForProductUsed = true;

package/lib/solution/ShopDiscount/index.js

@@ -349,7 +349,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         return Number(product == null ? void 0 : product.price) === 0;
       };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
-        return (allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
+        var _a3;
+        const sameIdTimes = ((_a3 = item.applicableProductIds) == null ? void 0 : _a3.filter((n) => n === id).length) || 1;
+        const targetIdTimes = (allUsedProductIds == null ? void 0 : allUsedProductIds.filter((n) => n === id).length) || 1;
+        return targetIdTimes >= sameIdTimes && (allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id)) || isProductFree(id);
       });
       if (!item.isSelected && isAllProductUsedOrFree) {
         item.isDisabledForProductUsed = true;

package/package.json

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