@pisell/pisellos 0.0.272 → 0.0.274

package/dist/modules/Order/index.js

@@ -55,16 +55,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.store = options.store;
               this.request = this.core.getPlugin('request');
               appPlugin = this.core.getPlugin('app');
-              if (appPlugin) {
-                _context.next = 6;
-                break;
+              if (!appPlugin) {
+                console.warn('Order 模块需要 app 插件支持');
               }
-              throw new Error('Order 模块需要 app 插件支持');
-            case 6:
-              app = appPlugin.getApp();
-              this.logger = app.logger;
+              app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
+              if (app) this.logger = app.logger;
               this.logInfo('OrderModule initialized successfully');
-            case 9:
+            case 8:
             case "end":
               return _context.stop();
           }

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

@@ -319,7 +319,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     checkMaxDurationCapacity(): boolean;
     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

@@ -2489,8 +2489,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var _m$_productOrigin, _targetProductData$id;
               return ((_m$_productOrigin = m._productOrigin) === null || _m$_productOrigin === void 0 || (_m$_productOrigin = _m$_productOrigin.id) === null || _m$_productOrigin === void 0 ? void 0 : _m$_productOrigin.toString()) === (targetProductData === null || targetProductData === void 0 || (_targetProductData$id = targetProductData.id) === null || _targetProductData$id === void 0 ? void 0 : _targetProductData$id.toString()) && "".concat(m.start_date, " ").concat(m.start_time) === item.start && "".concat(m.start_date, " ").concat(m.end_time) === item.end;
             });
-            if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size) {
+            if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
               bookingLeft = 0;
+              count = 0;
             }
             // 规则 2
             var otherCartItems = cartItems.filter(function (m) {
@@ -2508,8 +2509,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return currentResourcesSet.add(resource);
               });
             });
+            // 先确定是否每一个currentResourcesSet在这个时间点的 event_list 都是空的,如果不是空的还需要把他踢出currentResourcesSet
+            var currentDataResources = _this14.store.date.getResourcesListByDate(dayjs(item.start).format('YYYY-MM-DD'));
+            currentDataResources === null || currentDataResources === void 0 || currentDataResources.forEach(function (m) {
+              if (currentResourcesSet.has(m.id)) {
+                var mTimes = m.times.filter(function (n) {
+                  return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+                });
+                if (!mTimes.length || mTimes.some(function (n) {
+                  return n.event_list.length;
+                })) {
+                  currentResourcesSet.delete(m.id);
+                }
+              }
+            });
             if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
               bookingLeft = 0;
+              count = 0;
             }
           } else {
             // 多个预约的检测规则：
@@ -2526,6 +2542,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }, 0);
             if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
               bookingLeft = 0;
+              count = 0;
             }
             // 规则2、不管是不是跟我一样的商品，只需要跟我当前商品有同一种类型的资源的同一时间的，把所有购物车的 capacity 之和 和 所有当前类型资源的 capacity 之和比较，如果超过了resourcesCapacity，则不可用
             // const otherCartItems = cartItems.filter((m) => m._productOrigin?.id?.toString() !== targetProductData?.id?.toString() && m.start_time === item.start && m.end_time === item.end);
@@ -2556,8 +2573,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var currentTypeResourcesCapacity = allRenderList.reduce(function (acc, curr) {
               return acc + curr.capacity || 0;
             }, 0);
-            if (sameCartNeedCapacity + otherCartNeedCapacity >= currentTypeResourcesCapacity) {
+            // 计算当前时间段内所有资源的已使用容量
+            var usedCapacity = allRenderList.reduce(function (acc, curr) {
+              var mTimes = curr.times.filter(function (n) {
+                return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
+              });
+              mTimes.forEach(function (n) {
+                var _n$event_list;
+                acc += (_n$event_list = n.event_list) === null || _n$event_list === void 0 ? void 0 : _n$event_list.reduce(function (acc, curr) {
+                  return acc + curr.pax;
+                }, 0);
+              });
+              return acc;
+            }, 0);
+            // 如果已使用容量超过了当前类型资源的容量，则不可用
+            if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
               bookingLeft = 0;
+              count = 0;
             }
           }
         });

package/lib/modules/Order/index.js

@@ -49,10 +49,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.request = this.core.getPlugin("request");
     const appPlugin = this.core.getPlugin("app");
     if (!appPlugin) {
-      throw new Error("Order 模块需要 app 插件支持");
+      console.warn("Order 模块需要 app 插件支持");
     }
-    const app = appPlugin.getApp();
-    this.logger = app.logger;
+    const app = appPlugin == null ? void 0 : appPlugin.getApp();
+    if (app)
+      this.logger = app.logger;
     this.logInfo("OrderModule initialized successfully");
   }
   /**

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

@@ -319,7 +319,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     checkMaxDurationCapacity(): boolean;
     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

@@ -1744,8 +1744,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             var _a2, _b2, _c2;
             return ((_b2 = (_a2 = m._productOrigin) == null ? void 0 : _a2.id) == null ? void 0 : _b2.toString()) === ((_c2 = targetProductData == null ? void 0 : targetProductData.id) == null ? void 0 : _c2.toString()) && `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end;
           });
-          if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size) {
+          if (sameCartItems.length > 0 && sameCartItems.length >= currentResourcesSet.size || sameCartItems.length > bookingLeft) {
             bookingLeft = 0;
+            count = 0;
           }
           const otherCartItems = cartItems2.filter((m) => {
             var _a2, _b2, _c2;
@@ -1757,8 +1758,20 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const sameTypeResourcesSet = /* @__PURE__ */ new Set([...(sameTypeResources == null ? void 0 : sameTypeResources.optional_resource) || [], ...(sameTypeResources == null ? void 0 : sameTypeResources.default_resource) || []]);
             sameTypeResourcesSet.forEach((resource) => currentResourcesSet.add(resource));
           });
+          const currentDataResources = this.store.date.getResourcesListByDate((0, import_dayjs.default)(item.start).format("YYYY-MM-DD"));
+          currentDataResources == null ? void 0 : currentDataResources.forEach((m) => {
+            if (currentResourcesSet.has(m.id)) {
+              const mTimes = m.times.filter((n2) => {
+                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");
+              });
+              if (!mTimes.length || mTimes.some((n2) => n2.event_list.length)) {
+                currentResourcesSet.delete(m.id);
+              }
+            }
+          });
           if (currentResourcesSet.size > 0 && otherCartItems.length + sameCartItems.length >= currentResourcesSet.size) {
             bookingLeft = 0;
+            count = 0;
           }
         } else {
           const sameCartItems = cartItems2.filter((m) => {
@@ -1769,6 +1782,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const currentProductResourcesCapacity = n.renderList.reduce((acc, curr) => !curr.onlyComputed ? acc + curr.capacity || 0 : acc, 0);
           if (sameCartNeedCapacity >= currentProductResourcesCapacity) {
             bookingLeft = 0;
+            count = 0;
           }
           const otherSameTimesCartItems = cartItems2.filter((m) => `${m.start_date} ${m.start_time}` === item.start && `${m.start_date} ${m.end_time}` === item.end);
           const otherCartNeedCapacity = otherSameTimesCartItems.reduce((acc, curr) => acc + (0, import_capacity.getCapacityInfoByCartItem)(curr).currentCapacity, 0);
@@ -1792,8 +1806,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             });
           });
           const currentTypeResourcesCapacity = allRenderList.reduce((acc, curr) => acc + curr.capacity || 0, 0);
-          if (sameCartNeedCapacity + otherCartNeedCapacity >= currentTypeResourcesCapacity) {
+          const usedCapacity = allRenderList.reduce((acc, curr) => {
+            const mTimes = curr.times.filter((n2) => {
+              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");
+            });
+            mTimes.forEach((n2) => {
+              var _a2;
+              acc += (_a2 = n2.event_list) == null ? void 0 : _a2.reduce((acc2, curr2) => acc2 + curr2.pax, 0);
+            });
+            return acc;
+          }, 0);
+          if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
             bookingLeft = 0;
+            count = 0;
           }
         }
       });

package/package.json

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