@pisell/pisellos 0.0.158 → 0.0.160

package/dist/modules/Rules/index.js

@@ -458,7 +458,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 options: product.options
               }),
               variant: variant,
-              original_price: new Decimal(targetProductPrice).toNumber(),
+              original_price: new Decimal(product.price).toNumber(),
               total: getProductTotalPrice({
                 product: {
                   price: targetProductPrice

package/dist/solution/ShopDiscount/index.js

@@ -497,19 +497,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         }) : [];
       }).flat();
       newDiscountList.forEach(function (item) {
-        var _item$applicableProdu, _item$applicableProdu2;
-        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);
-        });
-        var isAllProductFree = (_item$applicableProdu2 = item.applicableProductIds) === null || _item$applicableProdu2 === void 0 ? void 0 : _item$applicableProdu2.every(function (id) {
+        var _item$applicableProdu;
+        var isProductFree = function isProductFree(id) {
           var _this3$hooks2;
           var targetProduct = productList.find(function (n) {
             return n.id === id;
           });
           var product = (_this3$hooks2 = _this3.hooks) === null || _this3$hooks2 === void 0 ? void 0 : _this3$hooks2.getProduct(targetProduct);
           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);
         });
-        if (!item.isSelected && (isAllProductUsed || isAllProductFree)) {
+        if (!item.isSelected && isAllProductUsedOrFree) {
           item.isDisabledForProductUsed = true;
         } else {
           item.isDisabledForProductUsed = false;

package/lib/modules/Rules/index.js

@@ -329,7 +329,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               options: product.options
             }),
             variant,
-            original_price: new import_decimal.default(targetProductPrice).toNumber(),
+            original_price: new import_decimal.default(product.price).toNumber(),
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
                 price: targetProductPrice

package/lib/solution/ShopDiscount/index.js

@@ -341,17 +341,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }) : [];
     }).flat();
     newDiscountList.forEach((item) => {
-      var _a2, _b;
-      const isAllProductUsed = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
-        return allUsedProductIds == null ? void 0 : allUsedProductIds.includes(id);
-      });
-      const isAllProductFree = (_b = item.applicableProductIds) == null ? void 0 : _b.every((id) => {
+      var _a2;
+      const isProductFree = (id) => {
         var _a3;
         const targetProduct = productList.find((n) => n.id === id);
         const product = (_a3 = this.hooks) == null ? void 0 : _a3.getProduct(targetProduct);
         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);
       });
-      if (!item.isSelected && (isAllProductUsed || isAllProductFree)) {
+      if (!item.isSelected && isAllProductUsedOrFree) {
         item.isDisabledForProductUsed = true;
       } else {
         item.isDisabledForProductUsed = false;

package/package.json

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