@pisell/pisellos 2.0.51 → 2.0.53

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

@@ -22,8 +22,9 @@ import { isNormalProduct } from "../../Product/utils";
 export var handleVariantProduct = function handleVariantProduct(product) {
   // 判断组合商品，然后直接修改 product 里的价格和 is_charge_tax
   if (product !== null && product !== void 0 && product.product_variant_id) {
+    var _product$variant;
     // 还需要判断 能从 variant 里找到对应的组合规格信息，才可以替换
-    var targetVariant = product.variant.find(function (n) {
+    var targetVariant = product === null || product === void 0 || (_product$variant = product.variant) === null || _product$variant === void 0 ? void 0 : _product$variant.find(function (n) {
       return n.id === product.product_variant_id;
     });
     if (targetVariant) {
@@ -45,6 +46,7 @@ export var handleVariantProduct = function handleVariantProduct(product) {
  */
 export var formatProductToCartItem = function formatProductToCartItem(params) {
   var _product$custom_depos;
+  console.log('formatProductToCartItem>>>>>>', params);
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
@@ -88,17 +90,17 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   }
   // 拼装出 product_option_string
   if (product_variant_id) {
-    var _product$variant$find;
-    var sku_key = (_product$variant$find = product.variant.find(function (n) {
+    var _product$variant2;
+    var sku_key = product === null || product === void 0 || (_product$variant2 = product.variant) === null || _product$variant2 === void 0 || (_product$variant2 = _product$variant2.find(function (n) {
       return n.id === product_variant_id;
-    })) === null || _product$variant$find === void 0 ? void 0 : _product$variant$find.sku_key;
+    })) === null || _product$variant2 === void 0 ? void 0 : _product$variant2.sku_key;
     if (sku_key) {
       var sku_key_arr = sku_key.split('_');
       var product_option_string = [];
       sku_key_arr.forEach(function (item) {
-        var _targetVariantGroup$v;
+        var _product$variant_grou, _targetVariantGroup$v;
         var keyMap = item.split(':');
-        var targetVariantGroup = product.variant_group.find(function (n) {
+        var targetVariantGroup = product === null || product === void 0 || (_product$variant_grou = product.variant_group) === null || _product$variant_grou === void 0 ? void 0 : _product$variant_grou.find(function (n) {
           return String(n.position_id) === keyMap[0];
         });
         var targetVariantItem = targetVariantGroup === null || targetVariantGroup === void 0 || (_targetVariantGroup$v = targetVariantGroup.variant_item) === null || _targetVariantGroup$v === void 0 ? void 0 : _targetVariantGroup$v.find(function (n) {
@@ -344,16 +346,38 @@ export var getProductDeposit = function getProductDeposit(params) {
         productHasDeposit = true;
       }
     } else {
+      // 组合规格商品
+      if (product !== null && product !== void 0 && product.product_variant_id) {
+        var _product$variant3;
+        var variantProduct = product === null || product === void 0 || (_product$variant3 = product.variant) === null || _product$variant3 === void 0 ? void 0 : _product$variant3.find(function (item) {
+          return (item === null || item === void 0 ? void 0 : item.id) === (product === null || product === void 0 ? void 0 : product.product_variant_id);
+        });
+        if (variantProduct) {
+          var depositData = variantProduct === null || variantProduct === void 0 ? void 0 : variantProduct.custom_deposit_data;
+          var _handleProductDeposit2 = handleProductDeposit({
+              depositData: depositData,
+              total: (cartItem === null || cartItem === void 0 ? void 0 : cartItem.total) || 0,
+              num: num
+            }),
+            _depositTotal = _handleProductDeposit2.depositTotal,
+            _result = _handleProductDeposit2.result;
+          if (_result) {
+            total = _depositTotal;
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
+            productHasDeposit = true;
+          }
+        }
+      }
       if (bundle !== null && bundle !== void 0 && bundle.length) {
         total = bundle.reduce(function (accumulator, currBundleProduct) {
           var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
-          var _handleProductDeposit2 = handleProductDeposit({
+          var _handleProductDeposit3 = handleProductDeposit({
               depositData: depositData,
               total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
               num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
             }),
-            depositTotal = _handleProductDeposit2.depositTotal,
-            result = _handleProductDeposit2.result;
+            depositTotal = _handleProductDeposit3.depositTotal,
+            result = _handleProductDeposit3.result;
           if (result) {
             protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
             productHasDeposit = true;

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/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/cartProduct.js

@@ -45,8 +45,9 @@ module.exports = __toCommonJS(cartProduct_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var handleVariantProduct = (product) => {
+  var _a;
   if (product == null ? void 0 : product.product_variant_id) {
-    const targetVariant = product.variant.find(
+    const targetVariant = (_a = product == null ? void 0 : product.variant) == null ? void 0 : _a.find(
       (n) => n.id === product.product_variant_id
     );
     if (targetVariant) {
@@ -60,7 +61,8 @@ var handleVariantProduct = (product) => {
   return product;
 };
 var formatProductToCartItem = (params) => {
-  var _a, _b;
+  var _a, _b, _c;
+  console.log("formatProductToCartItem>>>>>>", params);
   const {
     cartItem,
     product,
@@ -98,19 +100,19 @@ var formatProductToCartItem = (params) => {
     cartItem.options = formatOptions(options);
   }
   if (product_variant_id) {
-    const sku_key = (_a = product.variant.find(
+    const sku_key = (_b = (_a = product == null ? void 0 : product.variant) == null ? void 0 : _a.find(
       (n) => n.id === product_variant_id
-    )) == null ? void 0 : _a.sku_key;
+    )) == null ? void 0 : _b.sku_key;
     if (sku_key) {
       const sku_key_arr = sku_key.split("_");
       const product_option_string = [];
       sku_key_arr.forEach((item) => {
-        var _a2;
+        var _a2, _b2;
         const keyMap = item.split(":");
-        const targetVariantGroup = product.variant_group.find(
+        const targetVariantGroup = (_a2 = product == null ? void 0 : product.variant_group) == null ? void 0 : _a2.find(
           (n) => String(n.position_id) === keyMap[0]
         );
-        const targetVariantItem = (_a2 = targetVariantGroup == null ? void 0 : targetVariantGroup.variant_item) == null ? void 0 : _a2.find(
+        const targetVariantItem = (_b2 = targetVariantGroup == null ? void 0 : targetVariantGroup.variant_item) == null ? void 0 : _b2.find(
           (n) => String(n.position_id) === keyMap[1]
         );
         if (targetVariantGroup && targetVariantItem) {
@@ -122,7 +124,7 @@ var formatProductToCartItem = (params) => {
       cartItem.product_option_string = product_option_string.join(", ");
     }
   }
-  if (((_b = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _b.has_deposit) == 1) {
+  if (((_c = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _c.has_deposit) == 1) {
     cartItem.deposit = getProductDeposit({
       cartItem,
       product,
@@ -268,7 +270,7 @@ var formatBundleToOrigin = (bundle) => {
   });
 };
 var getProductDeposit = (params) => {
-  var _a;
+  var _a, _b;
   const { cartItem, product, bundle, options } = params;
   const num = (params == null ? void 0 : params.num) || 1;
   if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
@@ -294,6 +296,24 @@ var getProductDeposit = (params) => {
         productHasDeposit = true;
       }
     } else {
+      if (product == null ? void 0 : product.product_variant_id) {
+        const variantProduct = (_b = product == null ? void 0 : product.variant) == null ? void 0 : _b.find(
+          (item) => (item == null ? void 0 : item.id) === (product == null ? void 0 : product.product_variant_id)
+        );
+        if (variantProduct) {
+          const depositData = variantProduct == null ? void 0 : variantProduct.custom_deposit_data;
+          const { depositTotal, result } = handleProductDeposit({
+            depositData,
+            total: (cartItem == null ? void 0 : cartItem.total) || 0,
+            num
+          });
+          if (result) {
+            total = depositTotal;
+            protocolIds.push(...(depositData == null ? void 0 : depositData.self_deposit_policy_ids) || []);
+            productHasDeposit = true;
+          }
+        }
+      }
       if (bundle == null ? void 0 : bundle.length) {
         total = bundle.reduce((accumulator, currBundleProduct) => {
           const depositData = currBundleProduct == null ? void 0 : currBundleProduct.custom_deposit_data;

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