@pisell/pisellos 0.0.276 → 0.0.278

package/dist/solution/BookingByStep/index.js

@@ -2578,16 +2578,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               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');
               });
+              // 这里为什么要设置个 map，因为有可能日程有重叠，所以要把重叠的 event_list 去除
+              var mSet = new Map();
               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);
+                // acc += n.event_list?.reduce((acc: any, curr: any) => acc + curr.pax, 0);
+                // mSet.set(n)
+                n.event_list.forEach(function (m) {
+                  mSet.set(m.id, m.pax || 1);
+                });
               });
+              acc += Array.from(mSet.values()).reduce(function (acc, curr) {
+                return acc + curr;
+              }, 0);
               return acc;
             }, 0);
             // 如果已使用容量超过了当前类型资源的容量，则不可用
-            if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
+            if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
               bookingLeft = 0;
               count = 0;
             }

package/lib/solution/BookingByStep/index.js

@@ -1810,13 +1810,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             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");
             });
+            const mSet = /* @__PURE__ */ new Map();
             mTimes.forEach((n2) => {
-              var _a2;
-              acc += (_a2 = n2.event_list) == null ? void 0 : _a2.reduce((acc2, curr2) => acc2 + curr2.pax, 0);
+              n2.event_list.forEach((m) => {
+                mSet.set(m.id, m.pax || 1);
+              });
             });
+            acc += Array.from(mSet.values()).reduce((acc2, curr2) => acc2 + curr2, 0);
             return acc;
           }, 0);
-          if (sameCartNeedCapacity + otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
+          if (otherCartNeedCapacity + usedCapacity >= currentTypeResourcesCapacity) {
             bookingLeft = 0;
             count = 0;
           }

package/package.json

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