@pisell/pisellos 2.0.13 → 2.0.14

package/dist/modules/Cart/utils.js

@@ -550,6 +550,9 @@ export var getProductDeposit = function getProductDeposit(params) {
       deposit_policy_data = _ref2.deposit_policy_data;
     // 协议数据
     protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+    // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
+    var productHasDeposit = false;
+
     // 判断主商品是否有定金规则
     if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
       var _handleProductDeposit = handleProductDeposit({
@@ -561,6 +564,7 @@ export var getProductDeposit = function getProductDeposit(params) {
         result = _handleProductDeposit.result;
       if (result) {
         total = depositTotal;
+        productHasDeposit = true;
       }
     } else {
       if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -573,16 +577,20 @@ export var getProductDeposit = function getProductDeposit(params) {
             depositTotal = _handleProductDeposit2.depositTotal,
             result = _handleProductDeposit2.result;
           if (result) {
+            productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
           return accumulator;
         }, new Decimal(0));
       }
     }
-    return {
-      total: total.toNumber(),
-      protocols: protocols
-    };
+    if (productHasDeposit) {
+      return {
+        total: total.toNumber(),
+        protocols: protocols
+      };
+    }
+    return null;
   }
   return null;
 };

package/dist/solution/BookingByStep/utils/resources.js

@@ -110,7 +110,10 @@ var checkCapacity = function checkCapacity(_ref) {
     resource = _ref.resource,
     _ref$currentCount = _ref.currentCount,
     currentCount = _ref$currentCount === void 0 ? 1 : _ref$currentCount;
-  if (currentCount > resource.capacity) {
+  // 单个预约：如果当前资源容量不足以满足需求的容量，且当前资源是没有被占用的，返回资源不可用标记，但在外部运算会通过 reason=capacityOnly 来处理组合资源可用
+  // 多个预约：只需判断容量是否足够
+  var isMultipleBooking = resource.resourceType === 'multiple';
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/lib/modules/Cart/utils.js

@@ -445,6 +445,7 @@ var getProductDeposit = (params) => {
     let total = new import_decimal.default(0);
     const { deposit_fixed, deposit_percentage, deposit_policy_data } = (product == null ? void 0 : product.custom_deposit_data) || {};
     protocols.push(...deposit_policy_data || []);
+    let productHasDeposit = false;
     if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
       const { depositTotal, result } = handleProductDeposit({
         depositData: product == null ? void 0 : product.custom_deposit_data,
@@ -453,6 +454,7 @@ var getProductDeposit = (params) => {
       });
       if (result) {
         total = depositTotal;
+        productHasDeposit = true;
       }
     } else {
       if (bundle == null ? void 0 : bundle.length) {
@@ -463,13 +465,17 @@ var getProductDeposit = (params) => {
             num: currentBundleProduct.num
           });
           if (result) {
+            productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
           return accumulator;
         }, new import_decimal.default(0));
       }
     }
-    return { total: total.toNumber(), protocols };
+    if (productHasDeposit) {
+      return { total: total.toNumber(), protocols };
+    }
+    return null;
   }
   return null;
 };

package/lib/solution/BookingByStep/utils/resources.js

@@ -82,7 +82,8 @@ var checkCapacity = ({
   resource,
   currentCount = 1
 }) => {
-  if (currentCount > resource.capacity) {
+  const isMultipleBooking = resource.resourceType === "multiple";
+  if (currentCount > resource.capacity && (isMultipleBooking || !isMultipleBooking && event_list.length === 0)) {
     return {
       status: false,
       capacity: resource.capacity,

package/package.json

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