@pisell/pisellos 2.0.50 → 2.0.52

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/Rules/index.js

@@ -441,7 +441,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) {
+          if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
 

package/dist/solution/BookingByStep/index.js

@@ -2182,12 +2182,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 value: 10
               };
               resource.startTime = timeSlots.start_at.format('YYYY-MM-DD HH:mm');
-              // 找到resource.times里最早的end_at
+              // 找到resource.times里最晚的end_at
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
-                return dayjs(curr.end_at).isBefore(dayjs(acc.end_at)) ? curr : acc;
+                return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间

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/Rules/index.js

@@ -301,7 +301,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (Number(((_g = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _g.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
           productOriginTotal = product.total;
         }
-        if ((_h = product.discount_list) == null ? void 0 : _h.length) {
+        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
         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();

package/lib/solution/BookingByStep/index.js

@@ -1510,7 +1510,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             )) == null ? void 0 : _c.times;
             const resourcesEndTime = targetResourceTimes.reduce(
               (acc, curr) => {
-                return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
+                return (0, import_dayjs.default)(curr.end_at).isAfter((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
               },
               targetResourceTimes[0]
             );

package/package.json

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