@pisell/pisellos 0.0.144 → 0.0.146

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

@@ -61,6 +61,7 @@ export interface Discount {
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
+    isDisabledForProductUsed?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -179,8 +179,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         } 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(a.par_value || 0);
-            var valueB = new Decimal(b.par_value || 0);
+            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();
           }
           // 相同折扣的情况下，按照过期时间排序

package/dist/solution/ShopDiscount/index.js

@@ -460,6 +460,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
       })));
+      var allUsedProductIds = newDiscountList.map(function (n) {
+        return n.isSelected ? n.applicableProductIds : [];
+      }).flat();
+      newDiscountList.forEach(function (item) {
+        var _item$applicableProdu;
+        var isAllProductUsed = (_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);
+        });
+        if (!item.isSelected && isAllProductUsed) {
+          item.isDisabledForProductUsed = true;
+        } else {
+          item.isDisabledForProductUsed = false;
+        }
+      });
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;

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

@@ -61,6 +61,7 @@ export interface Discount {
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];
+    isDisabledForProductUsed?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -126,8 +126,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return compareByExpireTime(a, b);
       } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
         if (a.par_value !== b.par_value) {
-          const valueA = new import_decimal.default(a.par_value || 0);
-          const valueB = new import_decimal.default(b.par_value || 0);
+          const valueA = new import_decimal.default(100).minus(a.par_value || 0);
+          const valueB = new import_decimal.default(100).minus(b.par_value || 0);
           return valueA.minus(valueB).toNumber();
         }
         return compareByExpireTime(a, b);

package/lib/solution/ShopDiscount/index.js

@@ -296,6 +296,18 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       ...editModeDiscountList,
       ...discountList.filter((item) => !item.isDisabled)
     ];
+    const allUsedProductIds = newDiscountList.map((n) => n.isSelected ? n.applicableProductIds : []).flat();
+    newDiscountList.forEach((item) => {
+      var _a2;
+      const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
+        return allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id);
+      });
+      if (!item.isSelected && isAllProductUsed) {
+        item.isDisabledForProductUsed = true;
+      } else {
+        item.isDisabledForProductUsed = false;
+      }
+    });
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;

package/package.json

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