@pisell/pisellos 1.0.24 → 1.0.25

package/dist/modules/Rules/index.js

@@ -330,7 +330,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
-          if (Number(product.price) === 0 || !product.price) return false;
+          if (Number(product.price) === 0 && discount.tag === 'good_pass' || Number(product.total) === 0 && discount.tag !== 'good_pass' || !product.price) return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
@@ -422,16 +422,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 记录实际应用了优惠券的商品信息
           var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+          var productOriginTotal = product.origin_total || product.total || 0;
 
           // 计算使用折扣卡/商品券以后，单个商品的总 total
-          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.origin_total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.origin_total || 0)).toNumber();
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(productOriginTotal).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(productOriginTotal)).toNumber();
           var discountDetail = {
-            amount: new Decimal(product.origin_total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            amount: new Decimal(productOriginTotal).minus(new Decimal(targetProductTotal)).toNumber(),
             type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
               resource_id: _selectedDiscount.id,
               title: _selectedDiscount.format_title,
-              original_amount: product.origin_total,
+              original_amount: productOriginTotal,
               product_id: originProduct.id,
               percent: _selectedDiscount.par_value
             },
@@ -465,7 +466,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               total: targetProductTotal,
-              origin_total: product.origin_total || product.total
+              origin_total: productOriginTotal
             }));
           }
         }

package/dist/solution/ShopDiscount/index.js

@@ -504,7 +504,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             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;
+          return Number(product === null || product === void 0 ? void 0 : product.total) === 0;
         };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
           var _item$applicableProdu2;

package/lib/modules/Rules/index.js

@@ -213,7 +213,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        if (Number(product.price) === 0 || !product.price)
+        if (Number(product.price) === 0 && discount.tag === "good_pass" || Number(product.total) === 0 && discount.tag !== "good_pass" || !product.price)
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
@@ -293,14 +293,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.origin_total || 0)).toNumber();
+        const productOriginTotal = product.origin_total || product.total || 0;
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(productOriginTotal)).toNumber();
         const discountDetail = {
-          amount: new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+          amount: new import_decimal.default(productOriginTotal).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
             title: selectedDiscount2.format_title,
-            original_amount: product.origin_total,
+            original_amount: productOriginTotal,
             product_id: originProduct.id,
             percent: selectedDiscount2.par_value
           },
@@ -331,7 +332,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             total: targetProductTotal,
-            origin_total: product.origin_total || product.total
+            origin_total: productOriginTotal
           }));
         }
       }

package/lib/solution/ShopDiscount/index.js

@@ -346,7 +346,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         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;
+        return Number(product == null ? void 0 : product.total) === 0;
       };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
         var _a3;

package/package.json

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