@pisell/pisellos 2.0.42 → 2.0.44

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/dist/modules/Cart/utils/cartProduct.js

@@ -71,7 +71,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       product: product,
       bundle: bundle,
       options: options,
-      num: num
+      num: num,
+      discounts: discounts
     });
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
@@ -206,10 +207,11 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
 export var getProductOriginTotalPrice = function getProductOriginTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    discounts = params.discounts;
   var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
   var price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts !== null && discounts !== void 0 && discounts.length)) {
     return undefined;
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {

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;

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/Cart/utils/cartProduct.d.ts

@@ -54,6 +54,7 @@ export declare const getProductOriginTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number | undefined;
 /**
  * 格式化套餐规格信息

package/lib/modules/Cart/utils/cartProduct.js

@@ -82,7 +82,8 @@ var formatProductToCartItem = (params) => {
       product,
       bundle,
       options,
-      num
+      num,
+      discounts
     });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
@@ -189,10 +190,10 @@ var getProductTotalPrice = (params) => {
   return price;
 };
 var getProductOriginTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
-  if (isNaN(price) || price === 0) {
+  if ((isNaN(price) || price === 0) && !(discounts == null ? void 0 : discounts.length)) {
     return void 0;
   }
   if (bundle == null ? void 0 : bundle.length) {

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")

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": "2.0.42",
+  "version": "2.0.44",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",