@pisell/pisellos 3.0.66 → 3.0.67

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

@@ -68,12 +68,12 @@ var formatDefaultCapacitys = ({
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getSumCapacity = ({ capacity }) => {
+var getSumCapacity = ({ capacity, num = 1 }) => {
   let sum = 0;
   for (let item of capacity || []) {
     sum += item.value;
   }
-  return sum;
+  return sum * num;
 };
 function getCapacityInfoByCartItem(targetCartItem) {
   var _a;
@@ -81,7 +81,7 @@ function getCapacityInfoByCartItem(targetCartItem) {
     capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
     product_bundle: targetCartItem._origin.product.product_bundle
   });
-  const currentCapacity = getSumCapacity({ capacity: formatCapacity });
+  const currentCapacity = getSumCapacity({ capacity: formatCapacity, num: (targetCartItem == null ? void 0 : targetCartItem.num) || 1 });
   return {
     formatCapacity,
     currentCapacity
@@ -194,7 +194,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       );
       if (needsThisResourceType) {
         if (selectType === "single") {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem == null ? void 0 : cartItem.num) || 1);
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -238,13 +238,18 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
       if (totalAvailableCapacity < requiredCapacity) {
         console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: totalAvailableCapacity
+        };
       }
     } else {
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+          var _a2;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;
@@ -253,11 +258,19 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
       if (availableResourceCount < requiredCapacity) {
         console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
-        return false;
+        return {
+          success: false,
+          required: requiredCapacity,
+          available: availableResourceCount
+        };
       }
     }
   }
-  return true;
+  return {
+    success: true,
+    required: 0,
+    available: 0
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/solution/ShopDiscount/index.js

@@ -225,6 +225,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
+      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
+      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
+        return {
+          type: "clientCalc",
+          isAvailable: true,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
       const {
         productList: newProductList,
         discountList: newDiscountList,

package/package.json

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