@pisell/pisellos 0.0.328 → 0.0.330

package/lib/modules/Payment/index.js

@@ -323,48 +323,35 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       totalAmount: params.total_amount
     });
     try {
-      const existingOrder = await this.dbManager.get("order", params.order_id);
-      this.logInfo("createPaymentOrderAsync existingOrder", {
-        existingOrder
+      const newOrder = {
+        uuid: (0, import_utils.getUniqueId)("pay_order_"),
+        id: params.order_id,
+        order_id: params.order_id,
+        order_info: params.order_info,
+        payment_status: import_types.PaymentStatus.Processing,
+        payment: [],
+        adjust_offline_payments: [],
+        total_amount: params.total_amount,
+        expect_amount: params.total_amount,
+        tax_fee: "0.00",
+        is_deposit: params.is_deposit || 0,
+        deposit_amount: params.deposit_amount || "0.00"
+      };
+      const dbAddStartTime = Date.now();
+      await this.dbManager.add("order", newOrder);
+      const dbAddDuration = Date.now() - dbAddStartTime;
+      this.logInfo("Database add operation completed", {
+        operation: "dbManager.add",
+        table: "order",
+        orderUuid: newOrder.uuid,
+        orderId: newOrder.order_id,
+        duration: `${dbAddDuration}ms`,
+        performance: dbAddDuration > 100 ? "slow" : dbAddDuration > 50 ? "medium" : "fast"
       });
-      if (existingOrder) {
-        this.logInfo(
-          `createPaymentOrderAsync found duplicate order ID: ${params.order_id}, updating existing payment order`
-        );
-        existingOrder.order_info = params.order_info;
-        existingOrder.total_amount = params.total_amount;
-        existingOrder.is_deposit = params.is_deposit || 0;
-        existingOrder.deposit_amount = params.deposit_amount || "0.00";
-        this.recalculateOrderAmount(existingOrder);
-        await this.dbManager.update("order", existingOrder);
-        await this.core.effects.emit(
-          `${this.name}:onOrderUpdated`,
-          existingOrder
-        );
-        return existingOrder;
-      } else {
-        const newOrder = {
-          uuid: (0, import_utils.getUniqueId)("pay_order_"),
-          id: params.order_id,
-          order_id: params.order_id,
-          order_info: params.order_info,
-          payment_status: import_types.PaymentStatus.Processing,
-          payment: [],
-          adjust_offline_payments: [],
-          total_amount: params.total_amount,
-          expect_amount: params.total_amount,
-          tax_fee: "0.00",
-          is_deposit: params.is_deposit || 0,
-          deposit_amount: params.deposit_amount || "0.00"
-        };
-        await this.dbManager.add("order", newOrder);
+      setTimeout(() => {
         this.core.effects.emit(`${this.name}:onOrderAdded`, newOrder);
-        this.logInfo("createPaymentOrderAsync completed - new payment order created", {
-          orderUuid: newOrder.uuid,
-          orderId: newOrder.id
-        });
-        return newOrder;
-      }
+      }, 0);
+      return newOrder;
     } catch (error) {
       console.error("[PaymentModule] 创建支付订单失败", error);
       this.logError("createPaymentOrderAsync failed", error, {

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/solution/BookingByStep/index.d.ts

@@ -324,6 +324,15 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums(currentProduct: ProductData): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;

package/lib/solution/BookingByStep/index.js

@@ -34,16 +34,17 @@ __export(BookingByStep_exports, {
 module.exports = __toCommonJS(BookingByStep_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
+var import_utils = require("../../modules/Cart/utils");
 var import_products = require("./utils/products");
 var import_resources = require("./utils/resources");
 var import_dayjs = __toESM(require("dayjs"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
-var import_utils = require("../../modules/Resource/utils");
+var import_utils2 = require("../../modules/Resource/utils");
 var import_lodash_es = require("lodash-es");
-var import_utils2 = require("../../modules/Schedule/utils");
-var import_utils3 = require("../../modules/Date/utils");
-var import_utils4 = require("../../modules/Product/utils");
+var import_utils3 = require("../../modules/Schedule/utils");
+var import_utils4 = require("../../modules/Date/utils");
+var import_utils5 = require("../../modules/Product/utils");
 var import_timeslots = require("./utils/timeslots");
 var import_changePrice = require("../../modules/Cart/utils/changePrice");
 var import_capacity = require("./utils/capacity");
@@ -363,7 +364,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
       if (!date) {
         const normalProductCartItem = cartItems.find(
-          (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
+          (n) => !(0, import_utils5.isNormalProduct)(n._productOrigin)
         );
         date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
       }
@@ -473,7 +474,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let date = (_b = (_a = this.store.date.getDateRange()) == null ? void 0 : _a[0]) == null ? void 0 : _b.date;
         if (!date) {
           const normalProductCartItem = cartItems.find(
-            (n) => !(0, import_utils4.isNormalProduct)(n._productOrigin)
+            (n) => !(0, import_utils5.isNormalProduct)(n._productOrigin)
           );
           date = (normalProductCartItem == null ? void 0 : normalProductCartItem.start_date) || "";
         }
@@ -525,7 +526,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     let type = this.otherParams.isRetailTemplate ? "virtual" : "appointment_booking";
-    if ((0, import_utils4.areAllNormalProducts)(
+    if ((0, import_utils5.areAllNormalProducts)(
       newCartItems.map((n) => n._productOrigin)
     )) {
       type = "virtual";
@@ -648,7 +649,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     date
   }) {
     if (date) {
-      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+      const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
       const cartItemsByDate = cartItems.filter(
         (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
       );
@@ -810,7 +811,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    * @returns 不符合条件的购物车商品ID列表
    */
   checkCartItems(type) {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const errorCartItemIds = [];
     cartItems.forEach((cartItem) => {
       const result = this.store.cart.checkCartItemByType(cartItem, type);
@@ -844,7 +845,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     if (!resources.length) {
       const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
       if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
@@ -860,7 +861,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       }
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
@@ -989,14 +990,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
    */
   getResourcesListByCartItem(id) {
     var _a, _b;
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     dateRange.forEach((n) => {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
@@ -1053,7 +1054,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     capacity
   }) {
     var _a, _b, _c;
-    if ((0, import_utils4.isNormalProduct)(cartItem._productOrigin)) {
+    if ((0, import_utils5.isNormalProduct)(cartItem._productOrigin)) {
       return {};
     }
     const dateRange = this.store.date.getDateRange();
@@ -1088,7 +1089,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         });
       }
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(AllResources));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(AllResources));
     const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       allCartItems,
@@ -1169,7 +1170,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResource: targetResource
       };
     } else {
-      const resourcesMap2 = (0, import_utils.getResourcesMap)(resources);
+      const resourcesMap2 = (0, import_utils2.getResourcesMap)(resources);
       const resourceIds = resources.map((n) => n.id);
       const timeSlots2 = (0, import_resources.getTimeSlicesByResources)({
         resourceIds,
@@ -1307,7 +1308,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });
-          const resourcesMap = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
+          const resourcesMap = (0, import_utils2.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
@@ -1372,7 +1373,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     };
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
       accountList.forEach((account) => {
         const cartItems2 = this.store.cart.getCartByAccount(account.getId());
@@ -1388,7 +1389,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const resourceIds = [];
     let resourcesTypeId = void 0;
     let isSingleResource = false;
@@ -1426,7 +1427,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+    const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
     const checkDuration = (cartItems2) => {
@@ -1525,7 +1526,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
     var _a, _b;
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const allResources = this.store.date.getResourcesListByDate(
       timeSlots.start_at.format("YYYY-MM-DD")
     );
@@ -1603,7 +1604,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   getScheduleDataByIds(scheduleIds) {
     const targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);
     const targetSchedulesData = targetSchedules.map((item) => {
-      return (0, import_utils2.calcCalendarDataByScheduleResult)(item);
+      return (0, import_utils3.calcCalendarDataByScheduleResult)(item);
     });
     const newSchedule = {};
     targetSchedulesData.forEach((item) => {
@@ -1675,7 +1676,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourcesDates = this.store.date.getDateList();
     const targetResourceDate = resourcesDates.find((n) => n.date === date);
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
-    const resourcesMap = (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
+    const resourcesMap = (0, import_utils2.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []);
     const selectedResources = (0, import_resources.getOthersSelectedResources)(
       cartItems,
       "",
@@ -1687,12 +1688,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       selectedResources,
       1
     );
-    const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+    const minTimeMaxTime = (0, import_utils3.calcMinTimeMaxTimeBySchedules)(
       targetSchedules,
       {},
       date
     );
-    const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
+    const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
     let allProductResources = productResources.flatMap((n) => n.renderList);
     allProductResources.sort((a, b) => {
       var _a2, _b2, _c2, _d2;
@@ -1808,7 +1809,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           otherSameTimesCartItems.forEach((m) => {
             var _a2, _b2;
             const productResources2 = (0, import_resources.getResourcesByProduct)(
-              (0, import_utils.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []),
+              (0, import_utils2.getResourcesMap)((targetResourceDate == null ? void 0 : targetResourceDate.resource) || []),
               ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) || [],
               selectedResources,
               1
@@ -1955,7 +1956,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const targetResourceDate = resourcesDates.find((n) => n.date === dateRange[0].date);
       if (!targetResourceDate)
         return { success: false, minAvailableCount: 0 };
-      const resourcesMap = (0, import_utils.getResourcesMap)(targetResourceDate.resource || []);
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
       const resourceCodeToFormIdMap = {};
       Object.values(itemsByResourceType).flat().forEach((cartItem) => {
         var _a2, _b2;
@@ -2097,7 +2098,245 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const targetResourceDate = resourcesDates.find((n) => n.date === startDate);
       if (!targetResourceDate)
         continue;
-      const resourcesMap = (0, import_utils.getResourcesMap)(targetResourceDate.resource || []);
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
+      itemsInTimeSlot.forEach((cartItem) => {
+        if (!cartItem._productOrigin)
+          return;
+        const productResourceIds = (0, import_capacity.getResourcesIdsByProduct)(cartItem._productOrigin);
+        productResourceIds.forEach((resourceId) => {
+          if (resourcesMap[resourceId] && !resourcesIdSet.has(resourceId)) {
+            resourcesIdSet.add(resourceId);
+            allResourcesForTimeSlot.push(resourcesMap[resourceId]);
+          }
+        });
+      });
+      if (!(0, import_capacity.checkTimeSlotCapacity)(timeSlotStart, timeSlotEnd, itemsInTimeSlot, allResourcesForTimeSlot)) {
+        const minAvailableCount2 = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+        return { success: false, minAvailableCount: minAvailableCount2 };
+      }
+    }
+    const minAvailableCount = availableCountsByResourceType.length > 0 ? Math.min(...availableCountsByResourceType) : 0;
+    return { success: true, minAvailableCount };
+  }
+  /**
+   * 将 ProductData 转换为 CartItem，但不添加到购物车
+   * 参考 addProductToCart 方法的实现
+   */
+  convertProductToCartItem(product) {
+    const {
+      bundle,
+      options,
+      origin,
+      product_variant_id,
+      quantity = 1
+    } = product || {};
+    const productData = { ...origin, product_variant_id };
+    const processedProduct = (0, import_utils.handleVariantProduct)(productData);
+    const cartItem = {
+      _id: (0, import_utils.getUniqueId)("temp_"),
+      _origin: (0, import_utils.createCartItemOrigin)(),
+      _productOrigin: processedProduct,
+      _productInit: product
+    };
+    const activeAccount = this.getActiveAccount();
+    (0, import_utils.formatProductToCartItem)({
+      cartItem,
+      product: processedProduct,
+      bundle,
+      options,
+      product_variant_id,
+      quantity
+    });
+    return cartItem;
+  }
+  checkMaxDurationCapacityForDetailNums(currentProduct) {
+    var _a, _b;
+    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const currentCartItem = this.convertProductToCartItem(currentProduct);
+    cartItems.push(currentCartItem);
+    if (cartItems.length === 0)
+      return { success: true, minAvailableCount: 0 };
+    const itemsWithTime = [];
+    const itemsWithoutTime = [];
+    const availableCountsByResourceType = [];
+    cartItems.forEach((cartItem) => {
+      if (cartItem.start_time && cartItem.end_time && cartItem.start_date) {
+        itemsWithTime.push(cartItem);
+      } else {
+        itemsWithoutTime.push(cartItem);
+      }
+    });
+    const processedItemsWithoutTime = [];
+    if (itemsWithoutTime.length > 0) {
+      const itemsByResourceType = {};
+      itemsWithoutTime.forEach((cartItem) => {
+        var _a2;
+        if (!cartItem._productOrigin)
+          return;
+        const resourceTypes = ((_a2 = cartItem._productOrigin.product_resource) == null ? void 0 : _a2.resources) || [];
+        resourceTypes.forEach((resourceType) => {
+          var _a3;
+          if (resourceType.status === 1) {
+            const resourceCode = resourceType.code || ((_a3 = resourceType.id) == null ? void 0 : _a3.toString());
+            if (!itemsByResourceType[resourceCode]) {
+              itemsByResourceType[resourceCode] = [];
+            }
+            if (!itemsByResourceType[resourceCode].find((item) => item._id === cartItem._id)) {
+              itemsByResourceType[resourceCode].push(cartItem);
+            }
+          }
+        });
+      });
+      const dateRange = this.store.date.getDateRange();
+      if (!dateRange || dateRange.length === 0)
+        return { success: false, minAvailableCount: 0 };
+      const resourcesDates = this.store.date.getDateList();
+      const targetResourceDate = resourcesDates.find((n) => n.date === dateRange[0].date);
+      if (!targetResourceDate)
+        return { success: false, minAvailableCount: 0 };
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
+      const resourceCodeToFormIdMap = {};
+      Object.values(itemsByResourceType).flat().forEach((cartItem) => {
+        var _a2, _b2;
+        if ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) {
+          cartItem._productOrigin.product_resource.resources.forEach((resourceConfig) => {
+            var _a3, _b3;
+            if (resourceConfig.status === 1 && resourceConfig.code) {
+              const formId = ((_a3 = resourceConfig.id) == null ? void 0 : _a3.toString()) || ((_b3 = resourceConfig.resource_type_id) == null ? void 0 : _b3.toString());
+              if (formId) {
+                resourceCodeToFormIdMap[resourceConfig.code] = formId;
+              }
+            }
+          });
+        }
+      });
+      let hasCapacityIssue = false;
+      const resourceCapacityInfo = [];
+      const processedCartItemIds = /* @__PURE__ */ new Set();
+      for (const [resourceCode, items] of Object.entries(itemsByResourceType)) {
+        const targetFormId = resourceCodeToFormIdMap[resourceCode];
+        if (!targetFormId) {
+          console.log(`资源类型 ${resourceCode} 找不到对应的 form_id`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        const resourcesOfThisType = [];
+        items.forEach((cartItem) => {
+          const productResourceIds = (0, import_capacity.getResourcesIdsByProduct)(cartItem._productOrigin);
+          productResourceIds.forEach((resourceId) => {
+            var _a2;
+            const resource = resourcesMap[resourceId];
+            if (resource && ((_a2 = resource.form_id) == null ? void 0 : _a2.toString()) === targetFormId) {
+              if (!resourcesOfThisType.find((r) => r.id === resource.id)) {
+                resourcesOfThisType.push(resource);
+              }
+            }
+          });
+        });
+        if (resourcesOfThisType.length === 0) {
+          console.log(`资源类型 ${resourceCode} 没有找到可用资源`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        let resourceTypeConfig = null;
+        for (const cartItem of items) {
+          if ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) {
+            resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(
+              (r) => r.code === resourceCode && r.status === 1
+            );
+            if (resourceTypeConfig)
+              break;
+          }
+        }
+        const isMultipleBooking = (resourceTypeConfig == null ? void 0 : resourceTypeConfig.type) === "multiple";
+        let totalAvailable;
+        let requiredAmount;
+        let availableAmount;
+        if (isMultipleBooking) {
+          totalAvailable = resourcesOfThisType.reduce((sum, resource) => {
+            return sum + (resource.capacity || 0);
+          }, 0);
+          requiredAmount = items.reduce((sum, cartItem) => {
+            const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(cartItem);
+            return sum + currentCapacity;
+          }, 0);
+          availableAmount = Math.max(0, totalAvailable - requiredAmount);
+        } else {
+          totalAvailable = resourcesOfThisType.length;
+          requiredAmount = items.reduce((sum, cartItem) => {
+            return sum + (cartItem.num || 1);
+          }, 0);
+          availableAmount = Math.max(0, totalAvailable - requiredAmount);
+        }
+        resourceCapacityInfo.push({
+          code: resourceCode,
+          available: availableAmount,
+          total: totalAvailable,
+          required: requiredAmount,
+          isMultiple: isMultipleBooking
+        });
+        availableCountsByResourceType.push(availableAmount);
+        if (requiredAmount > totalAvailable) {
+          hasCapacityIssue = true;
+          console.log(`资源类型 ${resourceCode} ${isMultipleBooking ? "容量" : "资源数量"}不足: 需要 ${requiredAmount}, 总共 ${totalAvailable}`);
+        }
+        console.log(`资源类型 ${resourceCode} 的资源时间信息:`, resourcesOfThisType.map((r) => ({
+          id: r.id,
+          times: r.times.map((t) => `${t.start_at} - ${t.end_at}`)
+        })));
+        const commonTimeSlots = this.findCommonAvailableTimeSlots(resourcesOfThisType);
+        console.log(`资源类型 ${resourceCode} 的公共时间段:`, commonTimeSlots);
+        if (commonTimeSlots.length === 0) {
+          console.log(`资源类型 ${resourceCode} 没有公共可用时间段`);
+          return { success: false, minAvailableCount: 0 };
+        }
+        const firstCommonSlot = commonTimeSlots[0];
+        console.log(`使用公共时间段: ${firstCommonSlot.startTime} - ${firstCommonSlot.endTime}`);
+        items.forEach((cartItem) => {
+          if (!processedCartItemIds.has(cartItem._id)) {
+            processedCartItemIds.add(cartItem._id);
+            const processedItem = {
+              ...cartItem,
+              start_date: dateRange[0].date,
+              start_time: firstCommonSlot.startTime,
+              end_time: firstCommonSlot.endTime,
+              end_date: dateRange[0].date
+            };
+            processedItemsWithoutTime.push(processedItem);
+          }
+        });
+      }
+      if (hasCapacityIssue) {
+        const overCapacityResources = resourceCapacityInfo.filter((info) => info.required > info.total);
+        if (overCapacityResources.length > 0) {
+          const minTotalCapacity2 = Math.min(...overCapacityResources.map((info) => info.total));
+          return { success: false, minAvailableCount: minTotalCapacity2 };
+        }
+        const minTotalCapacity = Math.min(...resourceCapacityInfo.map((info) => info.total));
+        return { success: false, minAvailableCount: minTotalCapacity };
+      }
+    }
+    const allProcessedItems = [...itemsWithTime, ...processedItemsWithoutTime];
+    const cartItemsByTimeSlot = {};
+    allProcessedItems.forEach((cartItem) => {
+      if (!cartItem.start_time || !cartItem.end_time || !cartItem.start_date)
+        return;
+      const timeSlotKey = `${cartItem.start_date}_${cartItem.start_time}_${cartItem.end_date || cartItem.start_date}_${cartItem.end_time}`;
+      if (!cartItemsByTimeSlot[timeSlotKey]) {
+        cartItemsByTimeSlot[timeSlotKey] = [];
+      }
+      cartItemsByTimeSlot[timeSlotKey].push(cartItem);
+    });
+    for (const [timeSlotKey, itemsInTimeSlot] of Object.entries(cartItemsByTimeSlot)) {
+      const [startDate, startTime, endDate, endTime] = timeSlotKey.split("_");
+      const timeSlotStart = `${startDate} ${startTime}`;
+      const timeSlotEnd = `${endDate} ${endTime}`;
+      const allResourcesForTimeSlot = [];
+      const resourcesIdSet = /* @__PURE__ */ new Set();
+      const dateRange = this.store.date.getDateRange();
+      const resourcesDates = this.store.date.getDateList();
+      const targetResourceDate = resourcesDates.find((n) => n.date === startDate);
+      if (!targetResourceDate)
+        continue;
+      const resourcesMap = (0, import_utils2.getResourcesMap)(targetResourceDate.resource || []);
       itemsInTimeSlot.forEach((cartItem) => {
         if (!cartItem._productOrigin)
           return;
@@ -2168,8 +2407,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const resourcesMap = (0, import_utils2.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     const cartItem = cartItems.find((item) => item._id === cartItemId);
     if (!cartItem)
       return [];
@@ -2382,12 +2621,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       }
       if (status === "available") {
-        const minTimeMaxTime = (0, import_utils2.calcMinTimeMaxTimeBySchedules)(
+        const minTimeMaxTime = (0, import_utils3.calcMinTimeMaxTimeBySchedules)(
           targetSchedules,
           {},
           currentDateStr
         );
-        const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
+        const scheduleTimeSlots = (0, import_utils3.getAllSortedDateRanges)(minTimeMaxTime);
         const timesSlotCanUse = scheduleTimeSlots.some((item) => {
           const resourcesUseableMap = {};
           return openResources.every((resource) => {
@@ -2444,7 +2683,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
       currentDate = (0, import_dayjs.default)(currentDate).add(1, "day");
     }
-    dates = (0, import_utils3.handleAvailableDateByResource)(res.data, dates);
+    dates = (0, import_utils4.handleAvailableDateByResource)(res.data, dates);
     this.store.date.setDateList(dates);
     if (!this.store.currentProductMeta)
       this.store.currentProductMeta = {};
@@ -2460,11 +2699,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     };
   }
   isCartAllNormalProducts() {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     return !cartItems.length;
   }
   isCartHasDurationProduct() {
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils5.isNormalProduct)(n._productOrigin));
     return cartItems.some((n) => {
       var _a;
       return (_a = n._productOrigin) == null ? void 0 : _a.duration;
@@ -2473,11 +2712,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   isTargetNormalProduct(product) {
     if (!product)
       return false;
-    return (0, import_utils4.isNormalProduct)(product);
+    return (0, import_utils5.isNormalProduct)(product);
   }
   isTargetCartIdNormalProduct(id) {
     const cartItem = this.store.cart.getItems().find((n) => n._id === id);
-    return cartItem && (0, import_utils4.isNormalProduct)(cartItem._productOrigin);
+    return cartItem && (0, import_utils5.isNormalProduct)(cartItem._productOrigin);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/solution/BookingByStep/utils/capacity.d.ts

@@ -15,8 +15,9 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity }: {
+export declare const getSumCapacity: ({ capacity, num }: {
     capacity: CapacityItem[];
+    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity

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

@@ -68,20 +68,20 @@ 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;
+  var _a, _b, _c;
   const formatCapacity = formatDefaultCapacitys({
     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: ((_c = (_b = targetCartItem == null ? void 0 : targetCartItem._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.quantity) || 1 });
   return {
     formatCapacity,
     currentCapacity