@pisell/pisellos 1.0.78 → 1.0.79

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

@@ -178,18 +178,18 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   // 如果商品有折扣，则计算折扣
   if (discounts !== null && discounts !== void 0 && discounts.length) {
     discounts.forEach(function (currentValue) {
+      var _currentValue$discoun;
       // 不是商品券则代表折扣卡，计算打折后的价格
       // 一个商品折扣卡只能存在于一张
-      if (currentValue.type !== 'good_pass') {
-        var _currentValue$discoun;
-        price = getDiscountAmount({
-          tag: currentValue.type,
-          par_value: currentValue.discount.percent,
-          metadata: {
-            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
-          }
-        }, price, price);
-      }
+      // if (currentValue.type !== 'good_pass') {
+      price = getDiscountAmount({
+        tag: currentValue.type,
+        par_value: currentValue.discount.percent,
+        metadata: {
+          discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+        }
+      }, price, price);
+      // }
     });
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -204,7 +204,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return Math.max(0, price);
 };
 
 /**

package/dist/modules/Discount/index.js

@@ -268,7 +268,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0).mul((product === null || product === void 0 ? void 0 : product.num) || 1);
+          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0);
           return new Decimal(total).plus(price).toNumber();
         }, 0);
       }

package/dist/modules/Rules/index.js

@@ -411,8 +411,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.metadata) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.custom_product_bundle_map_id);
 
+          // 套餐是否可用判断
+          var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct) {
+          if (isAvailableProduct && isLimitedProduct && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -421,7 +424,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
             var discountType = discount.tag || discount.type;
             var productData = {
-              amount: product.price,
+              amount: product.price * (product.num || 1),
               type: discountType,
               tag: discountType,
               discount: {
@@ -649,7 +652,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 计算使用折扣卡/商品券以后，单个商品的总 total
             var targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
             var discountDetail = {
-              amount: new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber(),
+              amount: new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber() * (product.num || 1),
               type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
               discount: {
                 discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
@@ -772,7 +775,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
-              amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber(),
+              amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber() * (product.num || 1),
               type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
                 discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
@@ -797,7 +800,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
-              price: new Decimal(_productOriginTotal || 0).minus(_discountDetail2.amount).toNumber(),
+              price: new Decimal(_productOriginTotal || 0).minus(_discountDetail2.discount.fixed_amount).toNumber(),
               discount_list: [_discountDetail2],
               processed: true
             }));

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

@@ -175,15 +175,13 @@ var getProductTotalPrice = (params) => {
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
       var _a;
-      if (currentValue.type !== "good_pass") {
-        price = (0, import_utils2.getDiscountAmount)({
-          tag: currentValue.type,
-          par_value: currentValue.discount.percent,
-          metadata: {
-            discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
-          }
-        }, price, price);
-      }
+      price = (0, import_utils2.getDiscountAmount)({
+        tag: currentValue.type,
+        par_value: currentValue.discount.percent,
+        metadata: {
+          discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
+        }
+      }, price, price);
     });
   }
   if (bundle == null ? void 0 : bundle.length) {
@@ -196,7 +194,7 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return Math.max(0, price);
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;

package/lib/modules/Discount/index.js

@@ -163,7 +163,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0).mul((product == null ? void 0 : product.num) || 1);
+        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0);
         return new import_decimal.default(total).plus(price).toNumber();
       }, 0);
     }

package/lib/modules/Rules/index.js

@@ -268,12 +268,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
-        if (isAvailableProduct && isLimitedProduct) {
+        const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
+        if (isAvailableProduct && isLimitedProduct && isBundleAvailable) {
           (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const productData = {
-            amount: product.price,
+            amount: product.price * (product.num || 1),
             type: discountType,
             tag: discountType,
             discount: {
@@ -454,7 +455,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
           const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
           const discountDetail = {
-            amount: new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber(),
+            amount: new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber() * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
               discount_card_type: (_m = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _m.discount_card_type,
@@ -564,7 +565,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           );
           const uniqueId = flatItem._id;
           const discountDetail = {
-            amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
+            amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber() * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
               discount_card_type: (_n = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _n.discount_card_type,
@@ -588,7 +589,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedItems.push({
             ...flatItem,
             total: targetProductTotal,
-            price: new import_decimal.default(productOriginTotal || 0).minus(discountDetail.amount).toNumber(),
+            price: new import_decimal.default(productOriginTotal || 0).minus(discountDetail.discount.fixed_amount).toNumber(),
             discount_list: [discountDetail],
             processed: true
           });

package/package.json

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