@pisell/pisellos 3.0.16 → 3.0.19

package/lib/solution/BookingByStep/index.js

@@ -102,6 +102,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         throw new Error(`模块 ${step} 不存在`);
       }
     });
+    this.loadAllSchedule();
     this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
   }
   // 初始化step
@@ -204,12 +205,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 }
     ]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
-    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids, category_ids, schedule_date: date });
+    return await this.loadProducts({
+      schedule_ids: scheduleIds,
+      product_ids,
+      category_ids,
+      schedule_date: date
+    });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
     var _a;
-    const scheduleList = await this.request.get(`/schedule?num=999`);
+    const scheduleList = await this.request.get(`/schedule`, { num: 999 }, { useCache: true });
     this.store.schedule.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
   // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
@@ -267,10 +273,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 添加单个账户或者 guest
   async addAccount(account, extra) {
     if ((extra == null ? void 0 : extra.type) === "holder") {
-      const accountModules = await this.store.accountList.addHolderAccounts(
-        [account],
-        extra.customerId
-      );
+      const accountModules = await this.store.accountList.addHolderAccounts({
+        holders: [account],
+        customerId: extra.customerId,
+        type: "unshift"
+      });
       return accountModules[0].getAccount();
     }
     const newAccount = await this.store.accountList.addAccount(
@@ -281,10 +288,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 添加账户或者 guest
   async addAccounts(accounts, extra) {
     if ((extra == null ? void 0 : extra.type) === "holder") {
-      this.store.accountList.addHolderAccounts(
-        accounts,
-        extra.customerId
-      );
+      this.store.accountList.addHolderAccounts({
+        holders: accounts,
+        customerId: extra.customerId,
+        type: "unshift"
+      });
       return;
     }
     const res = [];
@@ -342,6 +350,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 获取商品/服务的可用日期
   async getAvailableDate(params = {}) {
+    var _a, _b, _c;
     let { products, startDate, endDate, type } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
@@ -364,8 +373,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       ];
     }
     let dateRange = this.store.date.getDateRange();
-    const tempStartDate = startDate || (dateRange == null ? void 0 : dateRange[0].date);
-    const tempEndDate = endDate || (dateRange == null ? void 0 : dateRange[1].date);
+    const tempStartDate = startDate || ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date);
+    const tempEndDate = endDate || ((_b = dateRange == null ? void 0 : dateRange[1]) == null ? void 0 : _b.date) || ((_c = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _c.date);
     if (!tempProducts.length) {
       return [];
     }
@@ -489,6 +498,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!targetCartItem) {
       throw new Error(`没有找到${params._id}购物车商品`);
     }
+    let currentResourcesCapacityMap = {};
     if (params.resources) {
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -497,38 +507,92 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       params.resources = params.resources.map((n) => {
         n.capacity = currentCapacity || 1;
+        currentResourcesCapacityMap[n.id] = currentCapacity;
         (0, import_resources.checkSubResourcesCapacity)(n);
         return n;
       });
     }
     this.store.cart.updateItem(params);
-    const cartItems = this.store.cart.getItems();
-    cartItems.forEach((item) => {
-      var _a2;
-      if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
-        const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-          return !targetCartItem._origin.resources.some((targetRes) => {
-            var _a3, _b;
-            if (targetRes.id === m.id)
-              return true;
-            if (((_a3 = targetRes.metadata.combined_resource) == null ? void 0 : _a3.status) === 1 && // 如果现在选择的是组合资源，需要判断
-            // 1、当前其他购物车里是否选了当前组合资源的子资源
-            // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
-            (targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some((n) => {
-              return m.metadata.combined_resource.resource_ids.includes(n);
-            })))
-              return true;
-            if (((_b = m.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
-              return true;
-            return false;
+    const allOriginResources = [];
+    const dateRange = this.store.date.getDateRange();
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          allOriginResources.push(...n.resource);
+      });
+    }
+    if (!allOriginResources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          allOriginResources.push(...n.resource);
+      });
+    }
+    if (params.resources) {
+      const cartItems = this.store.cart.getItems();
+      cartItems.forEach((item) => {
+        var _a2;
+        if (item._id !== targetCartItem._id) {
+          const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
+            return !targetCartItem._origin.resources.some((targetRes) => {
+              var _a3, _b, _c;
+              if (targetRes.resourceType !== "single") {
+                const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+                  capacity: (_a3 = item._productOrigin) == null ? void 0 : _a3.capacity,
+                  product_bundle: item._origin.product.product_bundle
+                });
+                const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+                const originResource = allOriginResources.find((n) => n.id === targetRes.id);
+                if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+                  return true;
+                }
+                currentResourcesCapacityMap[targetRes.id] += currentCapacity;
+                return false;
+              }
+              if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
+                if (targetRes.id === m.id)
+                  return true;
+                if (((_b = targetRes.metadata.combined_resource) == null ? void 0 : _b.status) === 1 && // 如果现在选择的是组合资源，需要判断
+                // 1、当前其他购物车里是否选了当前组合资源的子资源
+                // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+                (targetRes.metadata.combined_resource.resource_ids.includes(
+                  m.id
+                ) || targetRes.metadata.combined_resource.resource_ids.some(
+                  (n) => {
+                    return m.metadata.combined_resource.resource_ids.includes(
+                      n
+                    );
+                  }
+                )))
+                  return true;
+                if (((_c = m.metadata.combined_resource) == null ? void 0 : _c.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id))
+                  return true;
+              }
+              return false;
+            });
           });
-        });
-        this.store.cart.updateItem({
-          _id: item._id,
-          resources
-        });
-      }
-    });
+          if (item.start_time) {
+            const start_time = item.start_time;
+            const end_time = item.end_time;
+            const start_date = item.start_date;
+            const end_date = item.end_date;
+            this.store.cart.updateItem({
+              _id: item._id,
+              resources,
+              date: {
+                startTime: (0, import_dayjs.default)(`${start_date} ${start_time}`).format("YYYY-MM-DD HH:mm"),
+                endTime: (0, import_dayjs.default)(`${end_date} ${end_time}`).format("YYYY-MM-DD HH:mm")
+              }
+            });
+          } else {
+            this.store.cart.updateItem({
+              _id: item._id,
+              resources
+            });
+          }
+        }
+      });
+    }
   }
   // 删除购物车里某个商品
   deleteCart(cartItemId) {
@@ -609,10 +673,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const cartItems = this.store.cart.getItems();
     const arr = [];
-    const capacityMap = {};
     cartItems.forEach((cartItem) => {
       var _a, _b, _c;
       let selectedResources = [];
+      const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+        capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
+        product_bundle: cartItem._origin.product.product_bundle
+      });
+      cartItem._origin.metadata.capacity = formatCapacity;
+      const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
       if (cartItem.holder_id) {
         selectedResources = (0, import_resources.getOthersSelectedResources)(
           cartItems,
@@ -626,12 +695,133 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resourcesMap
         );
       }
+      const productResources = (0, import_resources.getResourcesByProduct)(
+        resourcesMap,
+        ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
+        selectedResources,
+        currentCapacity
+      );
+      if (cartItem._origin.start_time) {
+        const startTime = (0, import_dayjs.default)(
+          `${cartItem._origin.start_date} ${cartItem._origin.start_time}`
+        );
+        const endTime = (0, import_dayjs.default)(
+          `${cartItem._origin.end_date} ${cartItem._origin.end_time}`
+        );
+        const resourcesUseableMap = {};
+        productResources.forEach((n) => {
+          n.renderList = n.renderList.sort((a, b) => {
+            var _a2, _b2, _c2, _d;
+            const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
+            const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+            if (aIsCombined && !bIsCombined)
+              return 1;
+            if (!aIsCombined && bIsCombined)
+              return -1;
+            return 0;
+          });
+          n.renderList = n.renderList.filter((m) => {
+            const mTimes = m.times.filter((n2) => {
+              return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(endTime));
+            });
+            if (mTimes.length === 0) {
+              return false;
+            }
+            const canUseArr = mTimes.map((item) => {
+              const res = (0, import_resources.getIsUsableByTimeItem)({
+                timeSlice: {
+                  start_time: startTime.format("HH:mm"),
+                  end_time: endTime.format("HH:mm"),
+                  start_at: startTime,
+                  end_at: endTime
+                },
+                time: item,
+                resource: m,
+                currentCount: currentCapacity || 0,
+                resourcesUseableMap
+              });
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
+                resourcesUseableMap[m.id] = res.usable;
+              }
+              return res.usable;
+            });
+            if (m.onlyComputed)
+              return false;
+            return !canUseArr.some((n2) => n2 === false);
+          });
+        });
+      } else {
+        productResources.forEach((item) => {
+          item.renderList = item.renderList.filter((n) => {
+            var _a2, _b2;
+            const recordCount = n.capacity || 0;
+            if (n.onlyComputed)
+              return false;
+            const timeSlots = (0, import_resources.getTimeSlicesByResource)({
+              resource: n,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              split: 10,
+              currentDate: dateRange[0].date
+            });
+            return recordCount >= currentCapacity && timeSlots.length > 0;
+          });
+        });
+      }
+      arr.push({
+        id: cartItem.id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        _id: cartItem._id,
+        // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
+        product: cartItem._productOrigin,
+        resources: productResources,
+        holder_id: cartItem.holder_id,
+        holder_name: cartItem.holder_title
+      });
+    });
+    return arr;
+  }
+  // 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
+  checkResourceListForDate() {
+    const dateRange = this.store.date.getDateRange();
+    const resources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    if (!resources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
+    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const cartItems = this.store.cart.getItems();
+    const arr = [];
+    cartItems.forEach((cartItem) => {
+      var _a, _b, _c;
+      let selectedResources = [];
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
         product_bundle: cartItem._origin.product.product_bundle
       });
       cartItem._origin.metadata.capacity = formatCapacity;
       const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
+      if (cartItem.holder_id) {
+        selectedResources = (0, import_resources.getOthersSelectedResources)(
+          cartItems,
+          cartItem.holder_id,
+          resourcesMap
+        );
+      } else {
+        selectedResources = (0, import_resources.getOthersCartSelectedResources)(
+          cartItems,
+          cartItem._id,
+          resourcesMap
+        );
+      }
       const productResources = (0, import_resources.getResourcesByProduct)(
         resourcesMap,
         ((_c = (_b = cartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -658,7 +848,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             return 0;
           });
           n.renderList = n.renderList.filter((m) => {
-            const recordCount = capacityMap[m.id] || 0;
             const mTimes = m.times.filter((n2) => {
               return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(startTime)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(endTime));
             });
@@ -675,7 +864,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 },
                 time: item,
                 resource: m,
-                currentCount: recordCount + (currentCapacity || 0),
+                currentCount: currentCapacity || 0,
                 resourcesUseableMap
               });
               if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
@@ -710,13 +899,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
         _id: cartItem._id,
         // 这里返回的是购物车 id ，后面提交的时候要用的，用这个 id 绑定资源和时间
-        product: cartItem._productOrigin,
-        resources: productResources,
-        holder_id: cartItem.holder_id,
-        holder_name: cartItem.holder_title
+        productResources
       });
     });
-    return arr;
+    const hasResource = arr.every(
+      (n) => n.productResources.every((m) => m.renderList.length > 0)
+    );
+    return hasResource;
   }
   // 给单个购物车里的商品获取资源列表
   getResourcesListByCartItem(id) {
@@ -728,12 +917,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (n.resource)
         resources.push(...n.resource);
     });
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
+    const resourcesMap = (0, import_utils.getResourcesMap)(resources);
     const targetCartItem = cartItems.find((n) => n._id === id);
     if (!targetCartItem) {
       throw new Error(`没有找到${id}购物车商品`);
     }
     let selectedResources = [];
+    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
+      capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
+      product_bundle: targetCartItem._origin.product.product_bundle
+    });
+    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     if (targetCartItem.holder_id) {
       selectedResources = (0, import_resources.getOthersSelectedResources)(
         cartItems,
@@ -747,11 +941,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resourcesMap
       );
     }
-    const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-      capacity: (_a = targetCartItem._productOrigin) == null ? void 0 : _a.capacity,
-      product_bundle: targetCartItem._origin.product.product_bundle
-    });
-    const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
     const productResources = (0, import_resources.getResourcesByProduct)(
       resourcesMap,
       ((_c = (_b = targetCartItem._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) || [],
@@ -852,8 +1041,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const resourcesUseableMap = [...selectedResources].reduce((acc, n) => {
-      acc[n] = false;
+    const resourcesUseableMap = [
+      ...selectedResources
+    ].reduce((acc, n) => {
+      var _a2;
+      acc[n] = ((_a2 = resourcesMap[n]) == null ? void 0 : _a2.resourceType) === "single" ? false : true;
       return acc;
     }, {});
     if (timeSlots) {
@@ -919,14 +1111,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources.push(...n.resource);
       });
     }
-    const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const errorList = [];
     const selectResourcesMap = {};
     const accountList = this.store.accountList.getAccounts();
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
           capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
@@ -941,15 +1132,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           };
         }
         if (recordTimeSlots) {
-          if (index !== 0 && recordTimeSlots) {
+          const currentResourceConfig = (_d = (_c = (_b = item._productOrigin) == null ? void 0 : _b.product_resource) == null ? void 0 : _c.resources) == null ? void 0 : _d.find((n) => n.code === resources_code);
+          if (index !== 0 && recordTimeSlots && (currentResourceConfig == null ? void 0 : currentResourceConfig.type) === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_c = (_b = item._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.value) ?? 0,
-              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) ?? "minutes"
-            );
-            let end_at = start_at.add(
               ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
               ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
             );
+            let end_at = start_at.add(
+              ((_k = (_j = item._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.value) ?? 0,
+              ((_m = (_l = item._productOrigin) == null ? void 0 : _l.duration) == null ? void 0 : _m.type) ?? "minutes"
+            );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
               end_time: end_at.format("HH:mm"),
@@ -993,7 +1185,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
+            ((_o = (_n = item._productOrigin) == null ? void 0 : _n.product_resource) == null ? void 0 : _o.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1001,7 +1193,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
               n.renderList = n.renderList.filter((m) => {
                 var _a4;
-                const recordCount = m.capacity || 0;
+                const recordCount = (m.capacity || 0) - (selectResourcesMap[m.id] || 0);
                 const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
                   resource: m,
                   duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
@@ -1013,39 +1205,39 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });
-          const resourcesMap2 = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
+          const resourcesMap = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
               item.holder_id,
-              resourcesMap2
+              resourcesMap
             );
           } else {
             selectedResources = (0, import_resources.getOthersCartSelectedResources)(
               allCartItems,
               item._id,
-              resourcesMap2
+              resourcesMap
             );
           }
           const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap2,
+            resourcesMap,
             (0, import_lodash_es.cloneDeep)(resources2),
             selectedResources,
             currentCapacity
           );
           productResources.forEach((item2) => {
             item2.renderList = item2.renderList.filter((n) => {
-              const recordCount = n.capacity || 0;
+              const recordCount = (n.capacity || 0) - (selectResourcesMap[n.id] || 0);
               if (n.onlyComputed)
                 return false;
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_l = productResources.find(
+          const targetRenderList = (_p = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _l.renderList;
+          )) == null ? void 0 : _p.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_m = item._origin.resources) == null ? void 0 : _m.some(
+            if ((_q = item._origin.resources) == null ? void 0 : _q.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1053,6 +1245,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const targetResource = targetRenderList[0];
             targetResource.capacity = currentCapacity;
             (0, import_resources.checkSubResourcesCapacity)(targetResource);
+            if (!selectResourcesMap[targetResource.id]) {
+              selectResourcesMap[targetResource.id] = currentCapacity;
+            } else {
+              selectResourcesMap[targetResource.id] += currentCapacity;
+            }
             this.store.cart.updateItem({
               _id: item._id,
               resources: [
@@ -1162,23 +1359,27 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
-    const itemsByAccount = cartItems.reduce((acc, item) => {
-      const holderId = item.holder_id;
-      if (!acc[holderId]) {
-        acc[holderId] = [];
-      }
-      acc[holderId].push(item);
-      return acc;
-    }, {});
+    const itemsByAccount = cartItems.reduce(
+      (acc, item) => {
+        const holderId = item.holder_id;
+        if (!acc[holderId]) {
+          acc[holderId] = [];
+        }
+        acc[holderId].push(item);
+        return acc;
+      },
+      {}
+    );
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
+        var _a;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a, _b, _c, _d;
+          var _a2, _b, _c, _d;
           resource.startTime = currentStartTime;
           resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
-            ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0,
+            ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.value) ?? 0,
             ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
           ).format("YYYY-MM-DD HH:mm");
           delete resource.times;
@@ -1187,7 +1388,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           _id: item._id,
           resources: newResources
         });
-        if (index < accountItems.length - 1) {
+        if (index < accountItems.length - 1 && ((_a = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a.resourceType) === "single") {
           currentStartTime = newResources[0].endTime;
         }
       });

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

@@ -181,7 +181,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let optional_resource = item.optional_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+          var _a;
+          const isSelectSingleResources = ((_a = resourcesMap[d]) == null ? void 0 : _a.resourceType) === "single" && selectedResources.includes(resourcesMap[d].id);
+          if (resourcesMap[d] && !isSelectSingleResources) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -223,7 +225,9 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
       );
       let default_resource = item.default_resource.reduce(
         (childAcc, d) => {
-          if (resourcesMap[d] && !selectedResources.includes(resourcesMap[d].id)) {
+          var _a;
+          const isSelectSingleResources = ((_a = resourcesMap[d]) == null ? void 0 : _a.resourceType) === "single" && selectedResources.includes(resourcesMap[d].id);
+          if (resourcesMap[d] && !isSelectSingleResources) {
             const combiningResources = [];
             if (resourcesMap[d].combined_resource && resourcesMap[d].combined_resource.status === 1) {
               resourcesMap[d].combined_resource.resource_ids.forEach(
@@ -443,21 +447,16 @@ var getOthersSelectedResources = (cartItems, accountId, resourcesMap) => {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
-            n.metadata.combined_resource.resource_ids.forEach((m) => {
-              resourcesMap[m].capacity -= n.num;
-            });
           } else {
             Object.values(resourcesMap).forEach((m) => {
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
-                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
         });
       }
     }
@@ -477,21 +476,16 @@ var getOthersCartSelectedResources = (cartItems, cartItemId, resourcesMap) => {
               return acc;
             }
             acc.push(...n.metadata.combined_resource.resource_ids);
-            n.metadata.combined_resource.resource_ids.forEach((m) => {
-              resourcesMap[m].capacity -= n.num;
-            });
           } else {
             Object.values(resourcesMap).forEach((m) => {
               if (m.combined_resource && m.combined_resource.status === 1) {
                 if (m.combined_resource.resource_ids.includes(n.id)) {
                   acc.push(m.id);
-                  resourcesMap[m.id].capacity -= n.num;
                 }
               }
             });
           }
           acc.push(n.id);
-          resourcesMap[n.id].capacity -= n.num;
         });
       }
     }

package/lib/solution/ShopDiscount/index.js

@@ -271,7 +271,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         (item.discount_list || []).forEach((discount) => {
           var _a2, _b, _c;
-          if (discount.id) {
+          if (discount.id && discount.type === "good_pass") {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,