@pisell/pisellos 3.0.13 → 3.0.15

package/dist/modules/Step/index.d.ts

@@ -16,8 +16,18 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     getStepList(): IStep[];
     getCurrentStep(): IStep;
     getCurrentStepIndex(): number;
+    /**
+     * 上一个步骤
+     */
     prevStep(): void;
+    /**
+     * 下一个步骤
+     */
     nextStep(): void;
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
     gotoStep(stepIndex: number): void;
     /**
      * 添加步骤
@@ -30,5 +40,11 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
      * @param key 步骤的 key
      */
     removeStep(key: string): void;
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+    updateStep(key: string, step: IStep): void;
     storeChange(): void;
 }

package/dist/modules/Step/index.js

@@ -84,7 +84,8 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setCurrentStep",
     value: function setCurrentStep(stepIndex) {
-      if (stepIndex < 0 || stepIndex >= this.store.stepList.length) {
+      var _this$store$stepList;
+      if (stepIndex < 0 || stepIndex >= ((_this$store$stepList = this.store.stepList) === null || _this$store$stepList === void 0 ? void 0 : _this$store$stepList.length)) {
         return;
       }
       this.store.currentStepIndex = stepIndex;
@@ -105,20 +106,45 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
     value: function getCurrentStepIndex() {
       return this.store.currentStepIndex;
     }
+
+    /**
+     * 上一个步骤
+     */
   }, {
     key: "prevStep",
     value: function prevStep() {
-      if (this.store.currentStepIndex > 0) {
-        this.setCurrentStep(this.store.currentStepIndex - 1);
+      // 如果上一个步骤是跳过，则继续往前找，直到找到一个不是跳过的步骤
+      var prevStepIndex = this.store.currentStepIndex - 1;
+      while ((_this$store$stepList$ = this.store.stepList[prevStepIndex]) !== null && _this$store$stepList$ !== void 0 && _this$store$stepList$.isSkip) {
+        var _this$store$stepList$;
+        prevStepIndex--;
+      }
+      if (prevStepIndex >= 0) {
+        this.setCurrentStep(prevStepIndex);
       }
     }
+
+    /**
+     * 下一个步骤
+     */
   }, {
     key: "nextStep",
     value: function nextStep() {
-      if (this.store.currentStepIndex < this.store.stepList.length - 1) {
-        this.setCurrentStep(this.store.currentStepIndex + 1);
+      // 如果下一个步骤是跳过，则继续往后找，直到找到一个不是跳过的步骤
+      var nextStepIndex = this.store.currentStepIndex + 1;
+      while ((_this$store$stepList$2 = this.store.stepList[nextStepIndex]) !== null && _this$store$stepList$2 !== void 0 && _this$store$stepList$2.isSkip) {
+        var _this$store$stepList$2;
+        nextStepIndex++;
+      }
+      if (nextStepIndex < this.store.stepList.length) {
+        this.setCurrentStep(nextStepIndex);
       }
     }
+
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
   }, {
     key: "gotoStep",
     value: function gotoStep(stepIndex) {
@@ -170,6 +196,29 @@ export var StepModule = /*#__PURE__*/function (_BaseModule) {
       });
       this.store.stepList = _toConsumableArray(newStepList);
     }
+
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+  }, {
+    key: "updateStep",
+    value: function updateStep(key, step) {
+      var _this$store$stepList2, _this$store$currentSt;
+      var newStepList = (_this$store$stepList2 = this.store.stepList) === null || _this$store$stepList2 === void 0 ? void 0 : _this$store$stepList2.map(function (n) {
+        if (n.key === key) {
+          return step;
+        }
+        return n;
+      });
+
+      // 如果更新的是当前步骤，则更新当前步骤
+      if (key === ((_this$store$currentSt = this.store.currentStep) === null || _this$store$currentSt === void 0 ? void 0 : _this$store$currentSt.key)) {
+        this.store.currentStep = step;
+      }
+      this.store.stepList = _toConsumableArray(newStepList || []);
+    }
   }, {
     key: "storeChange",
     value: function storeChange() {

package/dist/modules/Step/tyeps.d.ts

@@ -6,6 +6,8 @@ export interface IStepState {
 export interface IStep {
     index: number;
     key: string;
+    /** 是否跳过 */
+    isSkip?: boolean;
     [key: string]: any;
 }
 export interface IStepModuleAPI {

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

@@ -38,6 +38,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
+    /**
+     * 更新step
+     */
+    updateStep(key: string, step: IStep): void;
     loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
@@ -51,7 +55,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
@@ -156,7 +160,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         resources: any[];
         currentResourceId: number;
     }): TimeSliceItem[];
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity, }: {
+    autoSelectAccountResources({ cartItem, holder_id, resources_code, timeSlots, countMap, capacity, }: {
+        cartItem: CartItem;
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;

package/dist/solution/BookingByStep/index.js

@@ -182,6 +182,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function removeStep(key) {
       this.store.step.removeStep(key);
     }
+
+    /**
+     * 更新step
+     */
+  }, {
+    key: "updateStep",
+    value: function updateStep(key, step) {
+      this.store.step.updateStep(key, step);
+    }
+
     // 获取购物车里 temp.xxx的方法
     // async getStoreCart(key?: string) {
     //   return this.store.cart.getTemp(key);
@@ -296,7 +306,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return this.request.get("/schedule");
+              return this.request.get("/schedule?num=999");
             case 2:
               scheduleList = _context4.sent;
               this.store.schedule.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
@@ -1044,7 +1054,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 检查主资源ID是否匹配
               if (targetRes.id === m.id) return true;
               // 检查组合资源的情况
-              if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && targetRes.metadata.combined_resource.resource_ids.includes(m.id)) return true;
+              if (((_targetRes$metadata$c = targetRes.metadata.combined_resource) === null || _targetRes$metadata$c === void 0 ? void 0 : _targetRes$metadata$c.status) === 1 && (
+              // 如果现在选择的是组合资源，需要判断
+              // 1、当前其他购物车里是否选了当前组合资源的子资源
+              // 2、如果其他购物车里的商品也是组合资源，出了组合资源本身的 id 需要判断，还需要判断子资源的 id 是否有交集
+
+              targetRes.metadata.combined_resource.resource_ids.includes(m.id) || targetRes.metadata.combined_resource.resource_ids.some(function (n) {
+                return m.metadata.combined_resource.resource_ids.includes(n);
+              }))) return true;
               if (((_m$metadata$combined_ = m.metadata.combined_resource) === null || _m$metadata$combined_ === void 0 ? void 0 : _m$metadata$combined_.status) === 1 && m.metadata.combined_resource.resource_ids.includes(targetRes.id)) return true;
               return false;
             });
@@ -1196,7 +1213,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
             n.renderList = n.renderList.filter(function (m) {
               var recordCount = capacityMap[m.id] || 0;
-              var canUseArr = m.times.map(function (item) {
+              // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
+              // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
+              // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+              var mTimes = m.times.filter(function (n) {
+                return !dayjs(n.start_at).isAfter(dayjs(startTime)) && !dayjs(n.end_at).isBefore(dayjs(endTime));
+              });
+              // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
+              if (mTimes.length === 0) {
+                return false;
+              }
+              var canUseArr = mTimes.map(function (item) {
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1225,10 +1252,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         } else {
           productResources.forEach(function (item) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
+            // 同时，在这一步尝试去拉一下时间片，基于商品的时长，看每个资源是否还有空余时间能对这个商品做服务，如果没有则过滤
             item.renderList = item.renderList.filter(function (n) {
+              var _cartItem$_productOri3;
               var recordCount = n.capacity || 0;
               if (n.onlyComputed) return false;
-              return recordCount >= currentCapacity;
+              // 查一下这个资源基于商品的可用时间片
+              var timeSlots = getTimeSlicesByResource({
+                resource: n,
+                duration: ((_cartItem$_productOri3 = cartItem._productOrigin) === null || _cartItem$_productOri3 === void 0 || (_cartItem$_productOri3 = _cartItem$_productOri3.duration) === null || _cartItem$_productOri3 === void 0 ? void 0 : _cartItem$_productOri3.value) || 0,
+                split: 10,
+                currentDate: dateRange[0].date
+              });
+              return recordCount >= currentCapacity && timeSlots.length > 0;
             });
           });
         }
@@ -1324,7 +1360,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAccountResources",
     value: function autoSelectAccountResources(_ref8) {
-      var holder_id = _ref8.holder_id,
+      var _cartItem$_productOri4, _allProductResources$;
+      var cartItem = _ref8.cartItem,
+        holder_id = _ref8.holder_id,
         resources_code = _ref8.resources_code,
         timeSlots = _ref8.timeSlots,
         countMap = _ref8.countMap,
@@ -1347,15 +1385,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 正常来说，能进这个业务的所有商品的 duration 类型都是一样的，所以这里取第一个商品的 duration 类型
       // let durationType = accountCartItems[0]?._productOrigin?.duration?.type ?? "minutes";
       // 取出账号下所对应类型的所有的可用资源
-      var resources = [];
-      accountCartItems.forEach(function (item) {
-        var _item$_productOrigin2;
-        (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.product_resource) === null || _item$_productOrigin2 === void 0 || (_item$_productOrigin2 = _item$_productOrigin2.resources) === null || _item$_productOrigin2 === void 0 || _item$_productOrigin2.forEach(function (n) {
-          if (n.code === resources_code) {
-            resources.push.apply(resources, _toConsumableArray(n.renderList || []));
-          }
+      // let resourcesCartItems: any[] = [];
+      // accountCartItems.forEach((item) => {
+      //   item._productOrigin?.product_resource?.resources?.forEach((n) => {
+      //     if (n.code === resources_code) {
+      //       resourcesCartItems.push(...(n.renderList || []));
+      //     }
+      //   });
+      // });
+      var AllResources = [];
+      if (dateRange !== null && dateRange !== void 0 && dateRange.length) {
+        dateRange.forEach(function (n) {
+          if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
         });
-      });
+      }
+      // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
+      if (!AllResources.length) {
+        var dateList = this.store.date.getDateList();
+        dateList.forEach(function (n) {
+          if (n.resource) AllResources.push.apply(AllResources, _toConsumableArray(n.resource));
+        });
+      }
+      var resourcesMap = getResourcesMap(cloneDeep(AllResources));
+      var allCartItems = cloneDeep(this.store.cart.getItems());
+      var selectedResources = getOthersSelectedResources(allCartItems, holder_id, resourcesMap);
+      var allProductResources = getResourcesByProduct(resourcesMap, ((_cartItem$_productOri4 = cartItem._productOrigin) === null || _cartItem$_productOri4 === void 0 || (_cartItem$_productOri4 = _cartItem$_productOri4.product_resource) === null || _cartItem$_productOri4 === void 0 ? void 0 : _cartItem$_productOri4.resources) || [], selectedResources, 1);
+      var resources = ((_allProductResources$ = allProductResources.find(function (n) {
+        return n.code === resources_code;
+      })) === null || _allProductResources$ === void 0 ? void 0 : _allProductResources$.renderList) || [];
       // 资源排下序，把单个资源靠前，组合资源排在后面
       resources.sort(function (a, b) {
         var _a$metadata2, _b$metadata2;
@@ -1365,7 +1422,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
       });
-      var resourcesUseableMap = {};
+      var resourcesUseableMap = _toConsumableArray(selectedResources).reduce(function (acc, n) {
+        acc[n] = false;
+        return acc;
+      }, {});
 
       // 如果有选择时间了，则代表不是第一种资源了，则需要根据开始时间去匹配
       // 每个商品
@@ -1380,29 +1440,47 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           _step2;
         try {
           var _loop = function _loop() {
-            var n = _step2.value;
-            var recordCount = countMap[n.id] || 0;
-            var canUseTime = n.times.find(function (item) {
-              var res = getIsUsableByTimeItem({
-                timeSlice: timeSlots,
-                time: item,
-                resource: n,
-                currentCount: recordCount + (capacity || 0),
-                resourcesUseableMap: resourcesUseableMap
+              var n = _step2.value;
+              // 如果资源是独占的，并且 countMap 里选择过这个资源，则直接跳过
+              // if (n.resourceType === 'single' && countMap[n.id]) {
+              //   resourcesUseableMap[n.id] = false;
+              //   continue
+              // }
+              var recordCount = countMap[n.id] || 0;
+              // n.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
+              // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
+              // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+              var mTimes = n.times.filter(function (n) {
+                return !dayjs(n.start_at).isAfter(dayjs(timeSlots.start_at)) && !dayjs(n.end_at).isBefore(dayjs(timeSlots.end_at));
               });
-              // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
-              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
-                resourcesUseableMap[n.id] = res.usable;
+              // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
+              if (mTimes.length === 0) {
+                return 0; // continue
               }
-              return res.usable;
-            });
-            if (canUseTime) {
-              targetResource = n;
-              return 1; // break
-            }
-          };
+              var canUseTime = mTimes.find(function (item) {
+                var res = getIsUsableByTimeItem({
+                  timeSlice: timeSlots,
+                  time: item,
+                  resource: n,
+                  currentCount: recordCount + (capacity || 0),
+                  resourcesUseableMap: resourcesUseableMap
+                });
+                // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
+                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
+                  resourcesUseableMap[n.id] = res.usable;
+                }
+                return res.usable;
+              });
+              if (canUseTime && !n.onlyComputed) {
+                targetResource = n;
+                return 1; // break
+              }
+            },
+            _ret;
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            if (_loop()) break;
+            _ret = _loop();
+            if (_ret === 0) continue;
+            if (_ret === 1) break;
           }
         } catch (err) {
           _iterator2.e(err);
@@ -1413,13 +1491,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           selectedResource: targetResource
         };
       } else {
-        var resourcesMap = getResourcesMap(resources);
+        var _resourcesMap = getResourcesMap(resources);
         var resourceIds = resources.map(function (n) {
           return n.id;
         });
         var _timeSlots = getTimeSlicesByResources({
           resourceIds: resourceIds,
-          resourcesMap: resourcesMap,
+          resourcesMap: _resourcesMap,
           duration: duration,
           currentDate: dateRange[0].date,
           split: 10,
@@ -1462,9 +1540,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // 第一个商品分配完以后，第二个商品分配的start_time应该是第一个商品的 end_time ,然后 end_time 应该是 start_time+duration
 
         cartItems.forEach(function (item, index) {
-          var _item$_productOrigin3;
+          var _item$_productOrigin2;
           var formatCapacity = formatDefaultCapacitys({
-            capacity: (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.capacity,
+            capacity: (_item$_productOrigin2 = item._productOrigin) === null || _item$_productOrigin2 === void 0 ? void 0 : _item$_productOrigin2.capacity,
             product_bundle: item._origin.product.product_bundle
           });
           var currentCapacity = getSumCapacity({
@@ -1481,9 +1559,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
           if (recordTimeSlots) {
             if (index !== 0 && recordTimeSlots) {
-              var _item$_productOrigin$, _item$_productOrigin4, _ref9, _item$_productOrigin5, _item$_productOrigin$2, _item$_productOrigin6, _ref10, _item$_productOrigin7;
-              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
-              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.duration) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
+              var _item$_productOrigin$, _item$_productOrigin3, _ref9, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref10, _item$_productOrigin6;
+              var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref9 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref9 !== void 0 ? _ref9 : 'minutes');
+              var end_at = start_at.add((_item$_productOrigin$2 = (_item$_productOrigin5 = item._productOrigin) === null || _item$_productOrigin5 === void 0 || (_item$_productOrigin5 = _item$_productOrigin5.duration) === null || _item$_productOrigin5 === void 0 ? void 0 : _item$_productOrigin5.value) !== null && _item$_productOrigin$2 !== void 0 ? _item$_productOrigin$2 : 0, (_ref10 = (_item$_productOrigin6 = item._productOrigin) === null || _item$_productOrigin6 === void 0 || (_item$_productOrigin6 = _item$_productOrigin6.duration) === null || _item$_productOrigin6 === void 0 ? void 0 : _item$_productOrigin6.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
               recordTimeSlots = {
                 start_time: start_at.format('HH:mm'),
                 end_time: end_at.format('HH:mm'),
@@ -1493,6 +1571,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
             // 如果传递了 timeSlots，代表是第二种资源，则直接拿 timeSlots 去匹配
             var res = _this8.autoSelectAccountResources({
+              cartItem: item,
               holder_id: item.holder_id,
               resources_code: resources_code,
               timeSlots: recordTimeSlots,
@@ -1515,7 +1594,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 _id: item._id,
                 // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
                 resources: [].concat(_toConsumableArray((item._origin.resources || []).filter(function (existingRes) {
-                  return existingRes.form_id !== res.selectedResource.form_id;
+                  var _res$selectedResource;
+                  return existingRes.form_id !== ((_res$selectedResource = res.selectedResource) === null || _res$selectedResource === void 0 ? void 0 : _res$selectedResource.form_id);
                 })), [res.selectedResource])
               });
             } else {
@@ -1523,31 +1603,38 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               errorList.push(item._id);
             }
           } else {
-            var _item$_productOrigin8, _productResources$fin;
+            var _item$_productOrigin7, _productResources$fin;
             // 这里必须每次循环重新读，避免前一次循环操作了购物车，导致数据变更
             var allCartItems = cloneDeep(_this8.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
-            var _resources = cloneDeep(((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.resources) || []);
+            var _resources = cloneDeep(((_item$_productOrigin7 = item._productOrigin) === null || _item$_productOrigin7 === void 0 || (_item$_productOrigin7 = _item$_productOrigin7.product_resource) === null || _item$_productOrigin7 === void 0 ? void 0 : _item$_productOrigin7.resources) || []);
             var currentResourcesRenderList = [];
             _resources.forEach(function (n) {
               var _n$renderList;
               if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
                 // 过滤掉 capacity 小于 currentCapacity 的资源
                 n.renderList = n.renderList.filter(function (m) {
+                  var _item$duration;
                   var recordCount = m.capacity || 0;
-                  return recordCount >= currentCapacity;
+                  var timeSlots = getTimeSlicesByResource({
+                    resource: m,
+                    duration: (item === null || item === void 0 || (_item$duration = item.duration) === null || _item$duration === void 0 ? void 0 : _item$duration.value) || 0,
+                    split: 10,
+                    currentDate: dateRange[0].date
+                  });
+                  return recordCount >= currentCapacity && timeSlots.length > 0;
                 });
                 currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
               }
             });
-            var _resourcesMap = getResourcesMap(currentResourcesRenderList);
+            var _resourcesMap2 = getResourcesMap(currentResourcesRenderList);
             if (item.holder_id) {
-              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, _resourcesMap);
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, _resourcesMap2);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap2);
             }
-            var productResources = getResourcesByProduct(_resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
+            var productResources = getResourcesByProduct(_resourcesMap2, cloneDeep(_resources), selectedResources, currentCapacity);
             productResources.forEach(function (item) {
               item.renderList = item.renderList.filter(function (n) {
                 var recordCount = n.capacity || 0;
@@ -1615,8 +1702,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var resourceIds = [];
       var resourcesTypeId = undefined;
       cartItems.forEach(function (item) {
-        var _item$_productOrigin9, _item$_productOrigin10;
-        (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.resources) === null || _item$_productOrigin9 === void 0 || _item$_productOrigin9.forEach(function (n) {
+        var _item$_productOrigin8, _item$_productOrigin9;
+        (_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.resources) === null || _item$_productOrigin8 === void 0 || _item$_productOrigin8.forEach(function (n) {
           if (n.code === resources_code) {
             resources.push.apply(resources, _toConsumableArray(n.renderList || []));
           }
@@ -1627,9 +1714,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (item.resource_id) {
           resourceIds.push(item.resource_id);
         }
-        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.product_resource) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.resources) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.find(function (n) {
+        resourcesTypeId = item === null || item === void 0 || (_item$_productOrigin9 = item._productOrigin) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.product_resource) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.resources) === null || _item$_productOrigin9 === void 0 || (_item$_productOrigin9 = _item$_productOrigin9.find(function (n) {
           return n.code === resources_code;
-        })) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.id;
+        })) === null || _item$_productOrigin9 === void 0 ? void 0 : _item$_productOrigin9.id;
       });
       // 保险起见，在这里如果 dateRange 里也有 resources 的话，也 push 进去
       if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
@@ -1649,8 +1736,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var checkDuration = function checkDuration(cartItems) {
         var accountDuration = 0;
         cartItems.forEach(function (item) {
-          var _item$_productOrigin$3, _item$_productOrigin11;
-          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
+          var _item$_productOrigin$3, _item$_productOrigin10;
+          accountDuration += (_item$_productOrigin$3 = (_item$_productOrigin10 = item._productOrigin) === null || _item$_productOrigin10 === void 0 || (_item$_productOrigin10 = _item$_productOrigin10.duration) === null || _item$_productOrigin10 === void 0 ? void 0 : _item$_productOrigin10.value) !== null && _item$_productOrigin$3 !== void 0 ? _item$_productOrigin$3 : 0;
         });
         if (accountDuration > duration) {
           duration = accountDuration;
@@ -1719,9 +1806,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         accountItems.forEach(function (item, index) {
           var newResources = cloneDeep(item._origin.resources);
           newResources.forEach(function (resource) {
-            var _item$_productOrigin$4, _item$_productOrigin12, _ref11, _item$_productOrigin13;
+            var _item$_productOrigin$4, _item$_productOrigin11, _ref11, _item$_productOrigin12;
             resource.startTime = currentStartTime;
-            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin13 = item._productOrigin) === null || _item$_productOrigin13 === void 0 || (_item$_productOrigin13 = _item$_productOrigin13.duration) === null || _item$_productOrigin13 === void 0 ? void 0 : _item$_productOrigin13.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
+            resource.endTime = dayjs(currentStartTime).add((_item$_productOrigin$4 = (_item$_productOrigin11 = item._productOrigin) === null || _item$_productOrigin11 === void 0 || (_item$_productOrigin11 = _item$_productOrigin11.duration) === null || _item$_productOrigin11 === void 0 ? void 0 : _item$_productOrigin11.value) !== null && _item$_productOrigin$4 !== void 0 ? _item$_productOrigin$4 : 0, (_ref11 = (_item$_productOrigin12 = item._productOrigin) === null || _item$_productOrigin12 === void 0 || (_item$_productOrigin12 = _item$_productOrigin12.duration) === null || _item$_productOrigin12 === void 0 ? void 0 : _item$_productOrigin12.type) !== null && _ref11 !== void 0 ? _ref11 : 'minutes').format('YYYY-MM-DD HH:mm');
             delete resource.times;
           });
           _this10.store.cart.updateItem({
@@ -1762,6 +1849,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         });
       });
       var newScheduleArr = Object.values(newSchedule);
+      // newScheduleArr 需要做个排序，按日期从小到大
+      newScheduleArr.sort(function (a, b) {
+        return dayjs(a.date).diff(dayjs(b.date));
+      });
       return newScheduleArr;
     }
     // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
@@ -1841,14 +1932,28 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         if (!aIsCombined && bIsCombined) return -1;
         return 0;
       });
-      var resourcesUseableMap = {};
+
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
+        // 用来计算资源的可使用情况，针对单个schedule 时间片
+        var resourcesUseableMap = {};
         var count = 0;
         // 遍历所有资源
         allProductResources === null || allProductResources === void 0 || allProductResources.forEach(function (m) {
           // 遍历所有资源的上工时间片
-          m.times.forEach(function (childTiem) {
+          var currentResourcesCount = 0;
+          var currentResourcesTimeSlotCanUsedArr = [];
+          // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
+          // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
+          // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+          var mTimes = m.times.filter(function (n) {
+            return !dayjs(n.start_at).isAfter(dayjs(item.start)) && !dayjs(n.end_at).isBefore(dayjs(item.end));
+          });
+          // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
+          if (mTimes.length === 0) {
+            return;
+          }
+          mTimes.forEach(function (childTiem) {
             // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
             var res = getIsUsableByTimeItem({
               timeSlice: {
@@ -1867,9 +1972,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               resourcesUseableMap[m.id] = res.usable;
             }
             if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
-              count = res.remainingCapacity;
+              currentResourcesCount = res.remainingCapacity;
             }
+            currentResourcesTimeSlotCanUsedArr.push(res.usable);
           });
+          // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
+          if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
+            return n === false;
+          }) && currentResourcesCount >= count) {
+            count = currentResourcesCount;
+          }
         });
         var startDayJs = dayjs(item.start);
         var endDayJs = dayjs(item.end);

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

@@ -16,8 +16,18 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     getStepList(): IStep[];
     getCurrentStep(): IStep;
     getCurrentStepIndex(): number;
+    /**
+     * 上一个步骤
+     */
     prevStep(): void;
+    /**
+     * 下一个步骤
+     */
     nextStep(): void;
+    /**
+     * 跳转到指定步骤
+     * @param stepIndex 步骤的 index
+     */
     gotoStep(stepIndex: number): void;
     /**
      * 添加步骤
@@ -30,5 +40,11 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
      * @param key 步骤的 key
      */
     removeStep(key: string): void;
+    /**
+     * 更新步骤
+     * @param key 步骤的 key
+     * @param step 步骤
+     */
+    updateStep(key: string, step: IStep): void;
     storeChange(): void;
 }

package/lib/modules/Step/index.js

@@ -55,7 +55,8 @@ var StepModule = class extends import_BaseModule.BaseModule {
     this.store.stepList = stepList;
   }
   setCurrentStep(stepIndex) {
-    if (stepIndex < 0 || stepIndex >= this.store.stepList.length) {
+    var _a;
+    if (stepIndex < 0 || stepIndex >= ((_a = this.store.stepList) == null ? void 0 : _a.length)) {
       return;
     }
     this.store.currentStepIndex = stepIndex;
@@ -70,16 +71,36 @@ var StepModule = class extends import_BaseModule.BaseModule {
   getCurrentStepIndex() {
     return this.store.currentStepIndex;
   }
+  /**
+   * 上一个步骤
+   */
   prevStep() {
-    if (this.store.currentStepIndex > 0) {
-      this.setCurrentStep(this.store.currentStepIndex - 1);
+    var _a;
+    let prevStepIndex = this.store.currentStepIndex - 1;
+    while ((_a = this.store.stepList[prevStepIndex]) == null ? void 0 : _a.isSkip) {
+      prevStepIndex--;
+    }
+    if (prevStepIndex >= 0) {
+      this.setCurrentStep(prevStepIndex);
     }
   }
+  /**
+   * 下一个步骤
+   */
   nextStep() {
-    if (this.store.currentStepIndex < this.store.stepList.length - 1) {
-      this.setCurrentStep(this.store.currentStepIndex + 1);
+    var _a;
+    let nextStepIndex = this.store.currentStepIndex + 1;
+    while ((_a = this.store.stepList[nextStepIndex]) == null ? void 0 : _a.isSkip) {
+      nextStepIndex++;
+    }
+    if (nextStepIndex < this.store.stepList.length) {
+      this.setCurrentStep(nextStepIndex);
     }
   }
+  /**
+   * 跳转到指定步骤
+   * @param stepIndex 步骤的 index
+   */
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
@@ -115,6 +136,24 @@ var StepModule = class extends import_BaseModule.BaseModule {
     const newStepList = this.store.stepList.filter((n) => n.key !== key);
     this.store.stepList = [...newStepList];
   }
+  /**
+   * 更新步骤
+   * @param key 步骤的 key
+   * @param step 步骤
+   */
+  updateStep(key, step) {
+    var _a, _b;
+    const newStepList = (_a = this.store.stepList) == null ? void 0 : _a.map((n) => {
+      if (n.key === key) {
+        return step;
+      }
+      return n;
+    });
+    if (key === ((_b = this.store.currentStep) == null ? void 0 : _b.key)) {
+      this.store.currentStep = step;
+    }
+    this.store.stepList = [...newStepList || []];
+  }
   storeChange() {
     if (this.openCache) {
       this.checkSaveCache({

package/lib/modules/Step/tyeps.d.ts

@@ -6,6 +6,8 @@ export interface IStepState {
 export interface IStep {
     index: number;
     key: string;
+    /** 是否跳过 */
+    isSkip?: boolean;
     [key: string]: any;
 }
 export interface IStepModuleAPI {

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

@@ -38,6 +38,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
+    /**
+     * 更新step
+     */
+    updateStep(key: string, step: IStep): void;
     loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
@@ -51,7 +55,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
@@ -156,7 +160,8 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         resources: any[];
         currentResourceId: number;
     }): TimeSliceItem[];
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity, }: {
+    autoSelectAccountResources({ cartItem, holder_id, resources_code, timeSlots, countMap, capacity, }: {
+        cartItem: CartItem;
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;

package/lib/solution/BookingByStep/index.js

@@ -142,6 +142,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   removeStep(key) {
     this.store.step.removeStep(key);
   }
+  /**
+   * 更新step
+   */
+  updateStep(key, step) {
+    this.store.step.updateStep(key, step);
+  }
   // 获取购物车里 temp.xxx的方法
   // async getStoreCart(key?: string) {
   //   return this.store.cart.getTemp(key);
@@ -203,7 +209,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
     var _a;
-    const scheduleList = await this.request.get(`/schedule`);
+    const scheduleList = await this.request.get(`/schedule?num=999`);
     this.store.schedule.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
   // ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
@@ -505,7 +511,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             var _a3, _b;
             if (targetRes.id === m.id)
               return true;
-            if (((_a3 = targetRes.metadata.combined_resource) == null ? void 0 : _a3.status) === 1 && targetRes.metadata.combined_resource.resource_ids.includes(m.id))
+            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;
@@ -648,7 +659,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
           n.renderList = n.renderList.filter((m) => {
             const recordCount = capacityMap[m.id] || 0;
-            const canUseArr = m.times.map((item) => {
+            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"),
@@ -674,10 +691,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       } else {
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
+            var _a2, _b2;
             const recordCount = n.capacity || 0;
             if (n.onlyComputed)
               return false;
-            return recordCount >= currentCapacity;
+            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;
           });
         });
       }
@@ -772,12 +796,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 自动分派可用资源-pro 版，ui 传递某个账号，自动给某个账号下所有商品分配第一种资源
   autoSelectAccountResources({
+    cartItem,
     holder_id,
     resources_code,
     timeSlots,
     countMap,
     capacity
   }) {
+    var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
     const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
     let accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
@@ -785,34 +811,62 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       accountCartItems = cartItems;
     }
     let duration = accountCartItems.reduce((acc, n) => {
-      var _a, _b;
-      return acc + (((_b = (_a = n._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0);
+      var _a2, _b2;
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
     }, 0);
-    let resources = [];
-    accountCartItems.forEach((item) => {
-      var _a, _b, _c;
-      (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
-        if (n.code === resources_code) {
-          resources.push(...n.renderList || []);
-        }
+    let AllResources = [];
+    if (dateRange == null ? void 0 : dateRange.length) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          AllResources.push(...n.resource);
       });
-    });
+    }
+    if (!AllResources.length) {
+      const dateList = this.store.date.getDateList();
+      dateList.forEach((n) => {
+        if (n.resource)
+          AllResources.push(...n.resource);
+      });
+    }
+    const resourcesMap = (0, import_utils.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,
+      holder_id,
+      resourcesMap
+    );
+    let allProductResources = (0, import_resources.getResourcesByProduct)(
+      resourcesMap,
+      ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [],
+      selectedResources,
+      1
+    );
+    const resources = ((_c = allProductResources.find((n) => n.code === resources_code)) == null ? void 0 : _c.renderList) || [];
     resources.sort((a, b) => {
-      var _a, _b, _c, _d;
-      const aIsCombined = ((_b = (_a = a.metadata) == null ? void 0 : _a.combined_resource) == null ? void 0 : _b.status) === 1;
-      const bIsCombined = ((_d = (_c = b.metadata) == null ? void 0 : _c.combined_resource) == null ? void 0 : _d.status) === 1;
+      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;
     });
-    const resourcesUseableMap = {};
+    const resourcesUseableMap = [...selectedResources].reduce((acc, n) => {
+      acc[n] = false;
+      return acc;
+    }, {});
     if (timeSlots) {
       let targetResource = null;
       for (const n of resources) {
         const recordCount = countMap[n.id] || 0;
-        const canUseTime = n.times.find((item) => {
+        const mTimes = n.times.filter((n2) => {
+          return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
+        });
+        if (mTimes.length === 0) {
+          continue;
+        }
+        const canUseTime = mTimes.find((item) => {
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: timeSlots,
             time: item,
@@ -825,7 +879,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           return res.usable;
         });
-        if (canUseTime) {
+        if (canUseTime && !n.onlyComputed) {
           targetResource = n;
           break;
         }
@@ -834,11 +888,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         selectedResource: targetResource
       };
     } else {
-      const resourcesMap = (0, import_utils.getResourcesMap)(resources);
+      const resourcesMap2 = (0, import_utils.getResourcesMap)(resources);
       const resourceIds = resources.map((n) => n.id);
       const timeSlots2 = (0, import_resources.getTimeSlicesByResources)({
         resourceIds,
-        resourcesMap,
+        resourcesMap: resourcesMap2,
         duration,
         currentDate: dateRange[0].date,
         split: 10,
@@ -904,6 +958,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             };
           }
           const res = this.autoSelectAccountResources({
+            cartItem: item,
             holder_id: item.holder_id,
             resources_code,
             timeSlots: recordTimeSlots,
@@ -923,7 +978,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
               resources: [
                 ...(item._origin.resources || []).filter(
-                  (existingRes) => existingRes.form_id !== res.selectedResource.form_id
+                  (existingRes) => {
+                    var _a3;
+                    return existingRes.form_id !== ((_a3 = res.selectedResource) == null ? void 0 : _a3.form_id);
+                  }
                 ),
                 res.selectedResource
               ]
@@ -934,14 +992,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         } else {
           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) || []);
+          const resources2 = (0, import_lodash_es.cloneDeep)(
+            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
+          );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
             var _a3;
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
               n.renderList = n.renderList.filter((m) => {
+                var _a4;
                 const recordCount = m.capacity || 0;
-                return recordCount >= currentCapacity;
+                const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
+                  resource: m,
+                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
+                  split: 10,
+                  currentDate: dateRange[0].date
+                });
+                return recordCount >= currentCapacity && timeSlots2.length > 0;
               });
               currentResourcesRenderList.push(...n.renderList || []);
             }
@@ -1030,7 +1097,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (item.resource_id) {
         resourceIds.push(item.resource_id);
       }
-      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find((n) => n.code === resources_code)) == null ? void 0 : _g.id;
+      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
+        (n) => n.code === resources_code
+      )) == null ? void 0 : _g.id;
     });
     if ((_b = (_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.resource) == null ? void 0 : _b.length) {
       dateRange[0].resource.forEach((n) => {
@@ -1146,6 +1215,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       });
     });
     const newScheduleArr = Object.values(newSchedule);
+    newScheduleArr.sort((a, b) => {
+      return (0, import_dayjs.default)(a.date).diff((0, import_dayjs.default)(b.date));
+    });
     return newScheduleArr;
   }
   // 打开某个商品详情的弹窗，OS 层这边会记录当前选中的商品，适用于 session 类商品预约
@@ -1214,11 +1286,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return -1;
       return 0;
     });
-    const resourcesUseableMap = {};
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
+      const resourcesUseableMap = {};
       let count = 0;
       allProductResources == null ? void 0 : allProductResources.forEach((m) => {
-        m.times.forEach((childTiem) => {
+        let currentResourcesCount = 0;
+        const currentResourcesTimeSlotCanUsedArr = [];
+        const mTimes = m.times.filter((n) => {
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start)) && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end));
+        });
+        if (mTimes.length === 0) {
+          return;
+        }
+        mTimes.forEach((childTiem) => {
           const res = (0, import_resources.getIsUsableByTimeItem)({
             timeSlice: {
               start_time: item.start,
@@ -1236,9 +1316,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             resourcesUseableMap[m.id] = res.usable;
           }
           if (res.usable && res.remainingCapacity >= count && !m.onlyComputed) {
-            count = res.remainingCapacity;
+            currentResourcesCount = res.remainingCapacity;
           }
+          currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && currentResourcesCount >= count) {
+          count = currentResourcesCount;
+        }
       });
       const startDayJs = (0, import_dayjs.default)(item.start);
       const endDayJs = (0, import_dayjs.default)(item.end);

package/package.json

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