@pisell/pisellos 2.1.20 → 2.1.22

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepHooks, createModule } from "./types";
 import { getAvailableProductResources } from "./utils/products";
-import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection } from "./utils/resources";
+import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
@@ -2058,7 +2058,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         // item._origin.resources?.forEach((n: any) => {
         //   resourceIds.push(n.relation_id);
         // });
-        if (item.resource_id) {
+        if (item.resource_id && !resourceIds.includes(item.resource_id)) {
           resourceIds.push(item.resource_id);
         }
         resourcesTypeId = item === null || item === void 0 || (_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 = _item$_productOrigin8.find(function (n) {
@@ -2153,6 +2153,26 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           return 0;
         }, 0);
       }
+      // 计算容量的辅助函数
+      var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
+        return items.reduce(function (total, item) {
+          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        }, 0);
+      };
+
+      // 如果是多个预约，去要求助几个 holder 下最大的需求容量capacity
+      var maxCapacity = 1;
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+        accountList.forEach(function (account) {
+          var accountCartItems = _this12.store.cart.getCartByAccount(account.getId());
+          var currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+          if (currentCapacity > maxCapacity) {
+            maxCapacity = currentCapacity;
+          }
+        });
+      } else {
+        maxCapacity = calculateCapacityFromCartItems(cartItems);
+      }
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,
@@ -2160,6 +2180,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         currentDate: dateRange[0].date,
         split: 10,
         resourcesUseableMap: resourcesUseableMap,
+        capacity: maxCapacity,
         cut_off_time: maxCutOffTime,
         hasFlexibleDuration: hasFlexibleDuration,
         operating_day_boundary: operating_day_boundary,
@@ -2577,12 +2598,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               });
               // 这里为什么要设置个 map，因为有可能日程有重叠，所以要把重叠的 event_list 去除
               var mSet = new Map();
-              mTimes.forEach(function (n) {
-                // acc += n.event_list?.reduce((acc: any, curr: any) => acc + curr.pax, 0);
-                // mSet.set(n)
-                n.event_list.forEach(function (m) {
+              n.event_list.forEach(function (m) {
+                // 需要确认 m 的时间段是否和 item 的时间段有交集
+                if (isConflict({
+                  start_at: m.start_at,
+                  end_at: m.end_at
+                }, {
+                  start_at: dayjs(item.start),
+                  end_at: dayjs(item.end)
+                })) {
                   mSet.set(m.id, m.pax || 1);
-                });
+                }
               });
               acc += Array.from(mSet.values()).reduce(function (acc, curr) {
                 return acc + curr;

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

@@ -20,6 +20,21 @@ export interface ResourceItem {
 interface BookingItem {
     [key: string]: any;
 }
+/**
+ * @title: 判断两个时间段是否有重叠
+ * @description:
+ * @param {object} event
+ * @param {object} current
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const isConflict: (event: {
+    start_at: DateType;
+    end_at: DateType;
+}, current: {
+    start_at: DateType;
+    end_at?: DateType;
+}) => boolean;
 /**
  * @title: 获取时间切片是否可用
  * @description: 根据时间切片、资源、当前预约量判断时间切片是否可用

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

@@ -42,7 +42,7 @@ var getUseableEventCount = function getUseableEventCount(eventList, current) {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-var isConflict = function isConflict(event, current) {
+export var isConflict = function isConflict(event, current) {
   var eventStart = dayjs(event.start_at);
   var eventEnd = dayjs(event.end_at);
   var currentStart = dayjs(current.start_at);

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -1399,7 +1399,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           isSingleResource = n.type === "single";
         }
       });
-      if (item.resource_id) {
+      if (item.resource_id && !resourceIds.includes(item.resource_id)) {
         resourceIds.push(item.resource_id);
       }
       resourcesTypeId = (_g2 = (_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(
@@ -1487,6 +1487,23 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return 0;
       }, 0);
     }
+    const calculateCapacityFromCartItems = (items) => {
+      return items.reduce((total, item) => {
+        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
+      }, 0);
+    };
+    let maxCapacity = 1;
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const accountCartItems = this.store.cart.getCartByAccount(account.getId());
+        const currentCapacity = calculateCapacityFromCartItems(accountCartItems);
+        if (currentCapacity > maxCapacity) {
+          maxCapacity = currentCapacity;
+        }
+      });
+    } else {
+      maxCapacity = calculateCapacityFromCartItems(cartItems);
+    }
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1494,6 +1511,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       currentDate: dateRange[0].date,
       split: 10,
       resourcesUseableMap,
+      capacity: maxCapacity,
       cut_off_time: maxCutOffTime,
       hasFlexibleDuration,
       operating_day_boundary,
@@ -1808,10 +1826,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n2.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n2.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
             });
             const mSet = /* @__PURE__ */ new Map();
-            mTimes.forEach((n2) => {
-              n2.event_list.forEach((m) => {
+            n.event_list.forEach((m) => {
+              if ((0, import_resources.isConflict)(
+                { start_at: m.start_at, end_at: m.end_at },
+                { start_at: (0, import_dayjs.default)(item.start), end_at: (0, import_dayjs.default)(item.end) }
+              )) {
                 mSet.set(m.id, m.pax || 1);
-              });
+              }
             });
             acc += Array.from(mSet.values()).reduce((acc2, curr2) => acc2 + curr2, 0);
             return acc;

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

@@ -20,6 +20,21 @@ export interface ResourceItem {
 interface BookingItem {
     [key: string]: any;
 }
+/**
+ * @title: 判断两个时间段是否有重叠
+ * @description:
+ * @param {object} event
+ * @param {object} current
+ * @return {*}
+ * @Author: zhiwei.Wang
+ */
+export declare const isConflict: (event: {
+    start_at: DateType;
+    end_at: DateType;
+}, current: {
+    start_at: DateType;
+    end_at?: DateType;
+}) => boolean;
 /**
  * @title: 获取时间切片是否可用
  * @description: 根据时间切片、资源、当前预约量判断时间切片是否可用

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

@@ -43,6 +43,7 @@ __export(resources_exports, {
   getTimeSlicesByResource: () => getTimeSlicesByResource,
   getTimeSlicesByResources: () => getTimeSlicesByResources,
   getTimesIntersection: () => getTimesIntersection,
+  isConflict: () => isConflict,
   mergeSubResourcesTimeSlices: () => mergeSubResourcesTimeSlices,
   sortCombinedResources: () => sortCombinedResources
 });
@@ -636,6 +637,7 @@ function checkTwoResourcesIntersection(resource1, resource2) {
   getTimeSlicesByResource,
   getTimeSlicesByResources,
   getTimesIntersection,
+  isConflict,
   mergeSubResourcesTimeSlices,
   sortCombinedResources
 });

package/package.json

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