@pisell/pisellos 3.0.44 → 3.0.46

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

@@ -23,8 +23,8 @@ function _updateAllCartItemPrice() {
           _iterator = _createForOfIteratorHelper(cartItems);
           _context2.prev = 1;
           _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-            var _bundle;
-            var item, targetProduct, cartProduct, productInfo, bundle;
+            var _item$_productOrigin, _bundle;
+            var item, targetProduct, cartProduct, productInfo, bundle, _productInfo$variant;
             return _regeneratorRuntime().wrap(function _loop$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -40,6 +40,7 @@ function _updateAllCartItemPrice() {
                   bundle = item._bundleOrigin;
                   productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
                   productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
+                  productInfo.product_variant_id = (_item$_productOrigin = item._productOrigin) === null || _item$_productOrigin === void 0 ? void 0 : _item$_productOrigin.product_variant_id;
                   bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
                     var _targetProduct$bundle;
                     // 更新 bundle 的价格
@@ -62,12 +63,29 @@ function _updateAllCartItemPrice() {
                     }
                     return n;
                   });
+                  // 如果有返回variant，则把对应variant的数据也补充进去
+                  if (targetProduct !== null && targetProduct !== void 0 && targetProduct.variant) {
+                    productInfo.variant = (_productInfo$variant = productInfo.variant) === null || _productInfo$variant === void 0 ? void 0 : _productInfo$variant.map(function (n) {
+                      var _targetProduct$varian;
+                      var targetVariant = (_targetProduct$varian = targetProduct.variant) === null || _targetProduct$varian === void 0 ? void 0 : _targetProduct$varian.find(function (m) {
+                        return m.id === n.id;
+                      });
+                      if (targetVariant) {
+                        return _objectSpread(_objectSpread({}, n), {}, {
+                          price: targetVariant.price,
+                          base_price: targetVariant.base_price
+                        });
+                      }
+                      return n;
+                    });
+                  }
                   updateCart({
                     _id: item._id,
                     product: productInfo,
-                    bundle: bundle
+                    bundle: bundle,
+                    options: item._optionsOrigin
                   });
-                case 11:
+                case 13:
                 case "end":
                   return _context.stop();
               }

package/dist/modules/Rules/index.js

@@ -319,7 +319,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct, i) {
-        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis6, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9;
+        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
@@ -330,11 +330,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
+          var _product$discount_lis6;
           // 如果商品价格为 0，其实不需要使用任何优惠券，直接 return true
           // 商品券时主商品价格为0不可用
           if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === 'good_pass') return false;
           // 折扣卡时总价为0时不可用
-          if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== 'good_pass') return false;
+          if ((Number(product.total) === 0 || !product.total) && !((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.find(function (n) {
+            var _n$discount;
+            return ((_n$discount = n.discount) === null || _n$discount === void 0 ? void 0 : _n$discount.resource_id) === discount.id;
+          })) && (discount.tag || discount.type) !== 'good_pass') return false;
           // 如果优惠券已被使用，则跳过
           var targetUsedDiscounts = usedDiscounts.get(discount.id);
           if (targetUsedDiscounts && (discount.tag || discount.type) === 'good_pass') return false;
@@ -358,12 +362,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || (product === null || product === void 0 || (_product$discount_lis7 = product.discount_list) === null || _product$discount_lis7 === void 0 || (_product$discount_lis8 = _product$discount_lis7.every) === null || _product$discount_lis8 === void 0 ? void 0 : _product$discount_lis8.call(_product$discount_lis7, function (item) {
+        var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.length) || (product === null || product === void 0 || (_product$discount_lis8 = product.discount_list) === null || _product$discount_lis8 === void 0 || (_product$discount_lis9 = _product$discount_lis8.every) === null || _product$discount_lis9 === void 0 ? void 0 : _product$discount_lis9.call(_product$discount_lis8, function (item) {
           return item.type === 'product';
         })));
 
         // 勾选时覆盖手动折扣
-        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
+        if (options !== null && options !== void 0 && options.discountId && (_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
           var _item$discount;
           return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
         })) {
@@ -425,7 +429,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _originProduct$_produ, _product$discount_lis10;
+          var _originProduct$_produ, _product$discount_lis11;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -441,7 +445,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             productOriginTotal = product.total;
           }
           // 如果当前 product 有 discount_list，则必须从 origin_total 拿
-          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
 

package/dist/solution/ShopDiscount/index.js

@@ -489,6 +489,15 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
       })));
+      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);
+        // 如果 product.total 是 0有可能是她已经用过商品券或者折扣卡导致的 0，所以此时还需要判断 origin_total 是否为 0
+        return Number(product === null || product === void 0 ? void 0 : product.total) === 0 && (Number(product === null || product === void 0 ? void 0 : product.origin_total) === 0 || !(product !== null && product !== void 0 && product.origin_total));
+      };
       var allUsedProductIds = newDiscountList.map(function (n) {
         var _n$appliedProductDeta;
         return n.isSelected ? (_n$appliedProductDeta = n.appliedProductDetails) === null || _n$appliedProductDeta === void 0 ? void 0 : _n$appliedProductDeta.map(function (n) {
@@ -498,14 +507,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       }).flat();
       newDiscountList.forEach(function (item) {
         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.total) === 0;
-        };
         var isAllProductUsedOrFree = (_item$applicableProdu = item.applicableProductIds) === null || _item$applicableProdu === void 0 ? void 0 : _item$applicableProdu.every(function (id) {
           var _item$applicableProdu2;
           // 检查当前 id是否在 item.applicableProductIds 里出现了几次，且要求次数和 item.applicableProductIds 里出现的次数一致

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

@@ -34,6 +34,7 @@ __export(changePrice_exports, {
 module.exports = __toCommonJS(changePrice_exports);
 var import_decimal = __toESM(require("decimal.js"));
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart) {
+  var _a, _b;
   for (const item of cartItems) {
     const targetProduct = priceData.find((n) => n.id === item.id);
     const cartProduct = await getProduct(
@@ -43,9 +44,10 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
     let bundle = item._bundleOrigin;
     productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
     productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
+    productInfo.product_variant_id = (_a = item._productOrigin) == null ? void 0 : _a.product_variant_id;
     bundle = bundle == null ? void 0 : bundle.map((n) => {
-      var _a;
-      const targetBundle = (_a = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a.find(
+      var _a2;
+      const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find(
         (m) => m.id === n.group_id
       );
       if (targetBundle) {
@@ -65,10 +67,25 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
       }
       return n;
     });
+    if (targetProduct == null ? void 0 : targetProduct.variant) {
+      productInfo.variant = (_b = productInfo.variant) == null ? void 0 : _b.map((n) => {
+        var _a2;
+        const targetVariant = (_a2 = targetProduct.variant) == null ? void 0 : _a2.find((m) => m.id === n.id);
+        if (targetVariant) {
+          return {
+            ...n,
+            price: targetVariant.price,
+            base_price: targetVariant.base_price
+          };
+        }
+        return n;
+      });
+    }
     updateCart({
       _id: item._id,
       product: productInfo,
-      bundle
+      bundle,
+      options: item._optionsOrigin
     });
   }
 }

package/lib/modules/Rules/index.js

@@ -214,9 +214,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
+        var _a2;
         if ((Number(product.price) === 0 || !product.price) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.total) === 0 || !product.total) && (discount.tag || discount.type) !== "good_pass")
+        if ((Number(product.total) === 0 || !product.total) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
+          var _a3;
+          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
+        })) && (discount.tag || discount.type) !== "good_pass")
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")

package/lib/solution/ShopDiscount/index.js

@@ -333,6 +333,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       ...editModeDiscountList,
       ...discountList.filter((item) => !item.isDisabled)
     ];
+    const isProductFree = (id) => {
+      var _a2;
+      const targetProduct = productList.find((n) => n.id === id);
+      const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
+      return Number(product == null ? void 0 : product.total) === 0 && (Number(product == null ? void 0 : product.origin_total) === 0 || !(product == null ? void 0 : product.origin_total));
+    };
     const allUsedProductIds = newDiscountList.map((n) => {
       var _a2;
       return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
@@ -342,12 +348,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     }).flat();
     newDiscountList.forEach((item) => {
       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.total) === 0;
-      };
       const isAllProductUsedOrFree = (_a2 = item.applicableProductIds) == null ? void 0 : _a2.every((id) => {
         var _a3;
         const sameIdTimes = ((_a3 = item.applicableProductIds) == null ? void 0 : _a3.filter((n) => n === id).length) || 1;

package/package.json

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