@pisell/pisellos 3.0.9 → 3.0.11

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

@@ -38,11 +38,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
-    loadProducts({ category_ids, product_ids, collection, schedule_ids, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_ids?: number[];
+        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
@@ -50,10 +51,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
+        channel?: string;
     }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(account: Account | IHolder, extra?: {

package/dist/solution/BookingByStep/index.js

@@ -193,11 +193,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
         var _schedule_ids;
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_ids_data, productsData;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$schedule_ids, schedule_ids, schedule_date, schedule_ids_data, productsData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids;
+              _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, _ref$schedule_ids = _ref.schedule_ids, schedule_ids = _ref$schedule_ids === void 0 ? [] : _ref$schedule_ids, schedule_date = _ref.schedule_date;
               // 如果 schedule_ids 为空，则需要尝试从 schedule 模块里获取
               if (!((_schedule_ids = schedule_ids) !== null && _schedule_ids !== void 0 && _schedule_ids.length)) {
                 schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map(function (n) {
@@ -220,7 +220,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 ids: product_ids,
                 collection: collection,
                 front_end_cache_id: this.cacheId,
-                client_schedule_ids: schedule_ids
+                client_schedule_ids: schedule_ids,
+                schedule_date: schedule_date
               }, {
                 useCache: true
               });
@@ -269,7 +270,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.loadProducts({
                 schedule_ids: scheduleIds,
                 product_ids: product_ids,
-                category_ids: category_ids
+                category_ids: category_ids,
+                schedule_date: date
               });
             case 6:
               return _context3.abrupt("return", _context3.sent);
@@ -314,11 +316,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref3) {
         var _res$data$date_list;
-        var startDate, endDate, custom_page_id, dates, res;
+        var startDate, endDate, custom_page_id, channel, dates, res;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id;
+              startDate = _ref3.startDate, endDate = _ref3.endDate, custom_page_id = _ref3.custom_page_id, channel = _ref3.channel;
               // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day')) {
                 startDate = dayjs().format('YYYY-MM-DD');
@@ -337,7 +339,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.get("/schedule/product/availability", {
                 start_date: startDate,
                 end_date: endDate,
-                custom_page_id: custom_page_id
+                custom_page_id: custom_page_id,
+                channel: channel
               });
             case 8:
               res = _context5.sent;
@@ -350,13 +353,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return _context5.abrupt("return", dates);
             case 12:
               res.data.date_list.forEach(function (n) {
-                if (n.schedule_id && n.schedule_id.length) {
-                  var index = dates.findIndex(function (m) {
-                    return m.date === n.date;
-                  });
-                  if (index !== -1) {
-                    dates[index].status = 'available';
-                  }
+                var index = dates.findIndex(function (m) {
+                  return m.date === n.date;
+                });
+                if (index !== -1) {
+                  dates[index].status = 'available';
                 }
               });
               dates = disableDatesBeforeOneDay(dates);
@@ -1195,7 +1196,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             });
             n.renderList = n.renderList.filter(function (m) {
               var recordCount = capacityMap[m.id] || 0;
-              var canUseTime = m.times.find(function (item) {
+              var canUseArr = m.times.map(function (item) {
                 var res = getIsUsableByTimeItem({
                   timeSlice: {
                     start_time: startTime.format('HH:mm'),
@@ -1208,12 +1209,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   currentCount: recordCount + (currentCapacity || 0),
                   resourcesUseableMap: resourcesUseableMap
                 });
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
+                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                   resourcesUseableMap[m.id] = res.usable;
                 }
                 return res.usable;
               });
-              return canUseTime;
+              if (m.onlyComputed) return false;
+              // 在已经选定时间的情况下，只要canUseTime 里有一个 false，那就代表不可用
+              return !canUseArr.some(function (n) {
+                return n === false;
+              });
             });
           });
         } else {
@@ -1221,6 +1227,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
             item.renderList = item.renderList.filter(function (n) {
               var recordCount = n.capacity || 0;
+              if (n.onlyComputed) return false;
               return recordCount >= currentCapacity;
             });
           });
@@ -1273,6 +1280,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         capacity: formatCapacity
       });
       var productResources = getResourcesByProduct(resourcesMap, ((_targetCartItem$_prod3 = targetCartItem._productOrigin) === null || _targetCartItem$_prod3 === void 0 || (_targetCartItem$_prod3 = _targetCartItem$_prod3.product_resource) === null || _targetCartItem$_prod3 === void 0 ? void 0 : _targetCartItem$_prod3.resources) || [], selectedResources, currentCapacity);
+      productResources.forEach(function (item) {
+        item.renderList = item.renderList.filter(function (n) {
+          var recordCount = n.capacity || 0;
+          if (n.onlyComputed) return false;
+          return recordCount >= currentCapacity;
+        });
+      });
       if (productResources) {
         return {
           id: targetCartItem.id,
@@ -1376,7 +1390,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 currentCount: recordCount + (capacity || 0),
                 resourcesUseableMap: resourcesUseableMap
               });
-              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false) {
+              // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
+              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
                 resourcesUseableMap[n.id] = res.usable;
               }
               return res.usable;
@@ -1533,6 +1548,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap);
             }
             var productResources = getResourcesByProduct(_resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
+            productResources.forEach(function (item) {
+              item.renderList = item.renderList.filter(function (n) {
+                var recordCount = n.capacity || 0;
+                if (n.onlyComputed) return false;
+                return recordCount >= currentCapacity;
+              });
+            });
             // 自动选择 productResources 中对应 resources_code 的资源
             var targetRenderList = (_productResources$fin = productResources.find(function (n) {
               return n.code === resources_code;
@@ -1613,7 +1635,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       if ((_dateRange = dateRange) !== null && _dateRange !== void 0 && (_dateRange = _dateRange[0]) !== null && _dateRange !== void 0 && (_dateRange = _dateRange.resource) !== null && _dateRange !== void 0 && _dateRange.length) {
         // resources.push(...dateRange[0].resource);
         dateRange[0].resource.forEach(function (n) {
-          if (n.form_id === resourcesTypeId) {
+          if (n.form_id === resourcesTypeId && !resources.find(function (m) {
+            return m.id === n.id;
+          })) {
             resources.push(n);
           }
         });
@@ -1838,10 +1862,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               currentCount: 1,
               resourcesUseableMap: resourcesUseableMap
             });
-            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
             }
-            // 如果资源可用，且是独占资源，remainingCapacity 始终为 1
             if (res.usable && res.remainingCapacity >= count) {
               count = res.remainingCapacity;
             }

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -38,6 +38,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表
@@ -95,6 +96,15 @@ export declare const getTimesIntersection: (times: TimeSliceItem[], count: numbe
  * @Date: 2024-09-19 20:23
  */
 export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceItem>, ids: number[]) => ResourceItem[];
+/**
+ * @title: 合并子资源的时间切片至组合资源
+ * @description:
+ * @param {ResourceItem[]} resources
+ * @param {Record<string, ResourceItem>} resourcesMap
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], resourcesMap: Record<string, ResourceItem>) => void;
 /**
  * @title: 根据资源id列表获取时间切片
  * @description:  传入一个技师id列表， 找出技师列表中公共的时间切片

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

@@ -113,7 +113,8 @@ var checkCapacity = function checkCapacity(_ref) {
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: 'capacityOnly'
     };
   }
   var conflict = (event_list || []).filter(function (d) {
@@ -179,7 +180,9 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0 // 剩余容量
+    remainingCapacity: 0,
+    // 剩余容量
+    reason: ''
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
@@ -204,6 +207,7 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
       }
     });
   }
+  status.reason = checkCapacityResult.reason || '';
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -238,6 +242,16 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
             resourcesMap[d].combined_resource.resource_ids.forEach(function (id) {
               if (resourcesMap[id]) {
                 combiningResources.push(resourcesMap[id]);
+                childAcc.push(Object.assign({}, resourcesMap[id], {
+                  form_id: form_id,
+                  resourceType: item.type,
+                  children: combiningResources,
+                  onlyComputed: true,
+                  // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
+                  metadata: _objectSpread(_objectSpread({}, resourcesMap[id].metadata), {}, {
+                    combined_resource: resourcesMap[id].combined_resource
+                  })
+                }));
               }
             });
           }
@@ -260,6 +274,16 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
             resourcesMap[d].combined_resource.resource_ids.forEach(function (id) {
               if (resourcesMap[id]) {
                 combiningResources.push(resourcesMap[id]);
+                childAcc.push(Object.assign({}, resourcesMap[id], {
+                  form_id: form_id,
+                  resourceType: item.type,
+                  children: combiningResources,
+                  onlyComputed: true,
+                  // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
+                  metadata: _objectSpread(_objectSpread({}, resourcesMap[id].metadata), {}, {
+                    combined_resource: resourcesMap[id].combined_resource
+                  })
+                }));
               }
             });
           }
@@ -458,6 +482,37 @@ export var getResourcesByIds = function getResourcesByIds(resourcesMap, ids) {
   });
 };
 
+/**
+ * @title: 合并子资源的时间切片至组合资源
+ * @description:
+ * @param {ResourceItem[]} resources
+ * @param {Record<string, ResourceItem>} resourcesMap
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export var mergeSubResourcesTimeSlices = function mergeSubResourcesTimeSlices(resources, resourcesMap) {
+  return resources.forEach(function (item) {
+    var _item$combined_resour;
+    if ((item === null || item === void 0 || (_item$combined_resour = item.combined_resource) === null || _item$combined_resour === void 0 ? void 0 : _item$combined_resour.status) === 1) {
+      var _item$combined_resour2;
+      item === null || item === void 0 || (_item$combined_resour2 = item.combined_resource) === null || _item$combined_resour2 === void 0 || _item$combined_resour2.resource_ids.forEach(function (id) {
+        var subResource = resourcesMap[id];
+        if (subResource) {
+          subResource.times.forEach(function (time) {
+            var fatherResourcesTime = item.times.find(function (n) {
+              return n.start_at === time.start_at && n.end_at === time.end_at;
+            });
+            if (fatherResourcesTime) {
+              var _fatherResourcesTime$;
+              (_fatherResourcesTime$ = fatherResourcesTime.event_list).push.apply(_fatherResourcesTime$, _toConsumableArray(time.event_list || []));
+            }
+          });
+        }
+      });
+    }
+  });
+};
+
 /**
  * @title: 根据资源id列表获取时间切片
  * @description:  传入一个技师id列表， 找出技师列表中公共的时间切片
@@ -476,6 +531,7 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref5) {
     resourcesUseableMap = _ref5.resourcesUseableMap;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
+  mergeSubResourcesTimeSlices(resources, resourcesMap);
   // 资源排下序，把单个资源靠前，组合资源排在后面
   resources.sort(function (a, b) {
     var _a$metadata, _b$metadata;

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

@@ -38,11 +38,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 删除step
      */
     removeStep(key: string): void;
-    loadProducts({ category_ids, product_ids, collection, schedule_ids, }: {
+    loadProducts({ category_ids, product_ids, collection, schedule_ids, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_ids?: number[];
+        schedule_date?: string;
     }): Promise<any>;
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
@@ -50,10 +51,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel }: {
         startDate: string;
         endDate: string;
         custom_page_id?: number;
+        channel?: string;
     }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
     addAccount(account: Account | IHolder, extra?: {

package/lib/solution/BookingByStep/index.js

@@ -151,7 +151,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     category_ids = [],
     product_ids = [],
     collection = [],
-    schedule_ids = []
+    schedule_ids = [],
+    schedule_date
   }) {
     if (!(schedule_ids == null ? void 0 : schedule_ids.length)) {
       const schedule_ids_data = this.store.schedule.getScheduleListByIds(schedule_ids).map((n) => n.id);
@@ -178,7 +179,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         ids: product_ids,
         collection,
         front_end_cache_id: this.cacheId,
-        client_schedule_ids: schedule_ids
+        client_schedule_ids: schedule_ids,
+        schedule_date
       },
       { useCache: true }
     );
@@ -196,7 +198,7 @@ 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 });
+    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids, category_ids, schedule_date: date });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
@@ -208,7 +210,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   async loadScheduleAvailableDate({
     startDate,
     endDate,
-    custom_page_id
+    custom_page_id,
+    channel
   }) {
     var _a;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
@@ -224,7 +227,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       {
         start_date: startDate,
         end_date: endDate,
-        custom_page_id
+        custom_page_id,
+        channel
       }
     );
     this.store.schedule.setAvailabilityScheduleDateList(res.data.date_list);
@@ -232,11 +236,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       return dates;
     }
     res.data.date_list.forEach((n) => {
-      if (n.schedule_id && n.schedule_id.length) {
-        const index = dates.findIndex((m) => m.date === n.date);
-        if (index !== -1) {
-          dates[index].status = "available";
-        }
+      const index = dates.findIndex((m) => m.date === n.date);
+      if (index !== -1) {
+        dates[index].status = "available";
       }
     });
     dates = (0, import_utils3.disableDatesBeforeOneDay)(dates);
@@ -646,7 +648,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
           n.renderList = n.renderList.filter((m) => {
             const recordCount = capacityMap[m.id] || 0;
-            const canUseTime = m.times.find((item) => {
+            const canUseArr = m.times.map((item) => {
               const res = (0, import_resources.getIsUsableByTimeItem)({
                 timeSlice: {
                   start_time: startTime.format("HH:mm"),
@@ -659,18 +661,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 currentCount: recordCount + (currentCapacity || 0),
                 resourcesUseableMap
               });
-              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
                 resourcesUseableMap[m.id] = res.usable;
               }
               return res.usable;
             });
-            return canUseTime;
+            if (m.onlyComputed)
+              return false;
+            return !canUseArr.some((n2) => n2 === false);
           });
         });
       } else {
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
             const recordCount = n.capacity || 0;
+            if (n.onlyComputed)
+              return false;
             return recordCount >= currentCapacity;
           });
         });
@@ -728,6 +734,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       selectedResources,
       currentCapacity
     );
+    productResources.forEach((item) => {
+      item.renderList = item.renderList.filter((n) => {
+        const recordCount = n.capacity || 0;
+        if (n.onlyComputed)
+          return false;
+        return recordCount >= currentCapacity;
+      });
+    });
     if (productResources) {
       return {
         id: targetCartItem.id,
@@ -806,7 +820,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             currentCount: recordCount + (capacity || 0),
             resourcesUseableMap
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[n.id] = res.usable;
           }
           return res.usable;
@@ -952,6 +966,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             selectedResources,
             currentCapacity
           );
+          productResources.forEach((item2) => {
+            item2.renderList = item2.renderList.filter((n) => {
+              const recordCount = n.capacity || 0;
+              if (n.onlyComputed)
+                return false;
+              return recordCount >= currentCapacity;
+            });
+          });
           const targetRenderList = (_l = productResources.find(
             (n) => n.code === resources_code
           )) == null ? void 0 : _l.renderList;
@@ -1012,7 +1034,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     if ((_b = (_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.resource) == null ? void 0 : _b.length) {
       dateRange[0].resource.forEach((n) => {
-        if (n.form_id === resourcesTypeId) {
+        if (n.form_id === resourcesTypeId && !resources.find((m) => m.id === n.id)) {
           resources.push(n);
         }
       });
@@ -1209,7 +1231,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             currentCount: 1,
             resourcesUseableMap
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[m.id] = res.usable;
           }
           if (res.usable && res.remainingCapacity >= count) {

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

@@ -38,6 +38,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表
@@ -95,6 +96,15 @@ export declare const getTimesIntersection: (times: TimeSliceItem[], count: numbe
  * @Date: 2024-09-19 20:23
  */
 export declare const getResourcesByIds: (resourcesMap: Record<string, ResourceItem>, ids: number[]) => ResourceItem[];
+/**
+ * @title: 合并子资源的时间切片至组合资源
+ * @description:
+ * @param {ResourceItem[]} resources
+ * @param {Record<string, ResourceItem>} resourcesMap
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], resourcesMap: Record<string, ResourceItem>) => void;
 /**
  * @title: 根据资源id列表获取时间切片
  * @description:  传入一个技师id列表， 找出技师列表中公共的时间切片

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

@@ -40,7 +40,8 @@ __export(resources_exports, {
   getSumCapacity: () => getSumCapacity,
   getTimeSlicesByResource: () => getTimeSlicesByResource,
   getTimeSlicesByResources: () => getTimeSlicesByResources,
-  getTimesIntersection: () => getTimesIntersection
+  getTimesIntersection: () => getTimesIntersection,
+  mergeSubResourcesTimeSlices: () => mergeSubResourcesTimeSlices
 });
 module.exports = __toCommonJS(resources_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -84,7 +85,8 @@ var checkCapacity = ({
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: "capacityOnly"
     };
   }
   let conflict = (event_list || []).filter((d) => {
@@ -132,8 +134,9 @@ var getIsUsableByTimeItem = ({
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0
+    remainingCapacity: 0,
     // 剩余容量
+    reason: ""
   };
   let earliest = (0, import_dayjs.default)();
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
@@ -154,6 +157,7 @@ var getIsUsableByTimeItem = ({
       }
     });
   }
+  status.reason = checkCapacityResult.reason || "";
   if (!checkCapacityResult.status) {
     return status;
   }
@@ -178,6 +182,19 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 (id) => {
                   if (resourcesMap[id]) {
                     combiningResources.push(resourcesMap[id]);
+                    childAcc.push(
+                      Object.assign({}, resourcesMap[id], {
+                        form_id,
+                        resourceType: item.type,
+                        children: combiningResources,
+                        onlyComputed: true,
+                        // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
+                        metadata: {
+                          ...resourcesMap[id].metadata,
+                          combined_resource: resourcesMap[id].combined_resource
+                        }
+                      })
+                    );
                   }
                 }
               );
@@ -207,6 +224,19 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
                 (id) => {
                   if (resourcesMap[id]) {
                     combiningResources.push(resourcesMap[id]);
+                    childAcc.push(
+                      Object.assign({}, resourcesMap[id], {
+                        form_id,
+                        resourceType: item.type,
+                        children: combiningResources,
+                        onlyComputed: true,
+                        // 是否是只用来计算用，组合资源里，假设商品只关联了组合资源没关联子资源，需要通过这个计算来在后面从 renderList 里删除这个资源
+                        metadata: {
+                          ...resourcesMap[id].metadata,
+                          combined_resource: resourcesMap[id].combined_resource
+                        }
+                      })
+                    );
                   }
                 }
               );
@@ -335,6 +365,24 @@ var getTimesIntersection = (times, count) => {
 var getResourcesByIds = (resourcesMap, ids) => {
   return (ids || []).map((id) => resourcesMap[id]);
 };
+var mergeSubResourcesTimeSlices = (resources, resourcesMap) => {
+  return resources.forEach((item) => {
+    var _a, _b;
+    if (((_a = item == null ? void 0 : item.combined_resource) == null ? void 0 : _a.status) === 1) {
+      (_b = item == null ? void 0 : item.combined_resource) == null ? void 0 : _b.resource_ids.forEach((id) => {
+        const subResource = resourcesMap[id];
+        if (subResource) {
+          subResource.times.forEach((time) => {
+            const fatherResourcesTime = item.times.find((n) => n.start_at === time.start_at && n.end_at === time.end_at);
+            if (fatherResourcesTime) {
+              fatherResourcesTime.event_list.push(...time.event_list || []);
+            }
+          });
+        }
+      });
+    }
+  });
+};
 var getTimeSlicesByResources = ({
   resourceIds,
   resourcesMap,
@@ -345,6 +393,7 @@ var getTimeSlicesByResources = ({
   resourcesUseableMap
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
+  mergeSubResourcesTimeSlices(resources, resourcesMap);
   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;
@@ -506,5 +555,6 @@ var checkSubResourcesCapacity = (resource) => {
   getSumCapacity,
   getTimeSlicesByResource,
   getTimeSlicesByResources,
-  getTimesIntersection
+  getTimesIntersection,
+  mergeSubResourcesTimeSlices
 });

package/package.json

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