@pisell/pisellos 2.0.29 → 2.0.31

package/dist/modules/Schedule/utils.js

@@ -143,7 +143,7 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
       var _end = _start.add(scheduleDiff, 'second');
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format('YYYY-MM-DD'))) {
-          startTmp = startTmp.day(1).add(frequency, 'week');
+          startTmp = startTmp.day(1).add(frequency, 'day');
           continue;
         }
         var arr = getDataRange({

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

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

package/dist/solution/BookingByStep/index.js

@@ -1266,7 +1266,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var _item$_origin$resourc;
             var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
               // 检查当前资源是否与目标资源的任何资源匹配
-              return !targetCartItem._origin.resources.some(function (targetRes) {
+              // 目标资源，应该只取跟当前 m.form_id 相同的资源
+              var sameFormIdResources = targetCartItem._origin.resources.filter(function (n) {
+                return n.form_id === m.form_id;
+              });
+              if (!(sameFormIdResources !== null && sameFormIdResources !== void 0 && sameFormIdResources.length)) {
+                return true;
+              }
+              return !sameFormIdResources.some(function (targetRes) {
                 // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
                 if (targetRes.resourceType !== 'single') {
                   var _item$_productOrigin2;
@@ -1280,10 +1287,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   var originResource = allOriginResources.find(function (n) {
                     return n.id === targetRes.id;
                   });
-                  if (currentResourcesCapacityMap[targetRes.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
+                  if (currentResourcesCapacityMap[m.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
                     return true;
                   }
-                  currentResourcesCapacityMap[targetRes.id] += _currentCapacity;
+                  currentResourcesCapacityMap[m.id] += _currentCapacity;
                   return false;
                 }
                 if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {
@@ -2795,7 +2802,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
         var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
         var params,
-          cache,
           startDate,
           endDate,
           tempProducts,
@@ -2803,6 +2809,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           filteredSchedule,
           tempResourceIds,
           res,
+          cache,
           dates,
           currentDate,
           firstAvailableDate,
@@ -2815,21 +2822,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               params = _args32.length > 0 && _args32[0] !== undefined ? _args32[0] : {};
-              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
-              if (!cache) {
-                _context32.next = 5;
-                break;
-              }
-              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 5;
-                break;
-              }
-              return _context32.abrupt("return", {
-                dateList: cache.dateList,
-                firstAvailableDate: cache.firstAvailableDate
-              });
-            case 5:
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -2838,11 +2830,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
               endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
-              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
+              schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 14;
+              _context32.next = 10;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2850,8 +2842,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 14:
+            case 10:
               res = _context32.sent;
+              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
+              // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
+              cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
+              if (!cache) {
+                _context32.next = 15;
+                break;
+              }
+              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
+                _context32.next = 15;
+                break;
+              }
+              return _context32.abrupt("return", {
+                dateList: cache.dateList,
+                firstAvailableDate: cache.firstAvailableDate
+              });
+            case 15:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -2860,7 +2868,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               openResources = ((_tempProducts = tempProducts) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.product_resource) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.resources) === null || _tempProducts === void 0 ? void 0 : _tempProducts.filter(function (m) {
                 return m.status === 1;
               })) || []; // res.data 返回的一定是启用商品的资源列表，不需要再过滤了
-              allProductResources = sortCombinedResources(res.data);
+              allProductResources = sortCombinedResources(res.data); // allProductResources 需要根据商品里的资源的单个预约多个预约补充resourceType
+              allProductResources.forEach(function (m) {
+                var _tempProducts2;
+                var resource = (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.product_resource) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.resources) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.find(function (n) {
+                  return n.id === m.form_id;
+                });
+                if (resource) {
+                  m.resourceType = resource.type;
+                }
+              });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
@@ -2917,7 +2934,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 return;
                               }
                               var targetCanUseTimes = mTimes.some(function (childTiem) {
-                                var _tempProducts2;
+                                var _tempProducts3;
                                 // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
                                 var res = getIsUsableByTimeItem({
                                   timeSlice: {
@@ -2930,7 +2947,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                   resource: m,
                                   currentCount: 1,
                                   resourcesUseableMap: resourcesUseableMap,
-                                  cut_off_time: (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.cut_off_time
+                                  cut_off_time: (_tempProducts3 = tempProducts) === null || _tempProducts3 === void 0 ? void 0 : _tempProducts3.cut_off_time
                                 });
                                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                                   resourcesUseableMap[m.id] = res.usable;
@@ -2969,22 +2986,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 22:
+            case 23:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 28;
+                _context32.next = 29;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 24);
-            case 24:
+              return _context32.delegateYield(_loop3(), "t0", 25);
+            case 25:
               if (!_context32.t0) {
-                _context32.next = 26;
+                _context32.next = 27;
                 break;
               }
-              return _context32.abrupt("break", 28);
-            case 26:
-              _context32.next = 22;
+              return _context32.abrupt("break", 29);
+            case 27:
+              _context32.next = 23;
               break;
-            case 28:
+            case 29:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3000,7 +3017,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 32:
+            case 33:
             case "end":
               return _context32.stop();
           }

package/lib/modules/Schedule/utils.js

@@ -143,7 +143,7 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
       const _end = _start.add(scheduleDiff, "second");
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
-          startTmp = startTmp.day(1).add(frequency, "week");
+          startTmp = startTmp.day(1).add(frequency, "day");
           continue;
         }
         const arr = getDataRange({

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

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

package/lib/solution/BookingByStep/index.js

@@ -643,7 +643,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a2;
         if (item._id !== targetCartItem._id) {
           const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-            return !targetCartItem._origin.resources.some((targetRes) => {
+            const sameFormIdResources = targetCartItem._origin.resources.filter((n) => n.form_id === m.form_id);
+            if (!(sameFormIdResources == null ? void 0 : sameFormIdResources.length)) {
+              return true;
+            }
+            return !sameFormIdResources.some((targetRes) => {
               var _a3, _b, _c;
               if (targetRes.resourceType !== "single") {
                 const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
@@ -656,10 +660,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 const originResource = allOriginResources.find(
                   (n) => n.id === targetRes.id
                 );
-                if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+                if (currentResourcesCapacityMap[m.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
                   return true;
                 }
-                currentResourcesCapacityMap[targetRes.id] += currentCapacity;
+                currentResourcesCapacityMap[m.id] += currentCapacity;
                 return false;
               }
               if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {
@@ -1982,23 +1986,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async getAvailableDateForSessionOptimize(params = {}) {
     var _a, _b, _c, _d, _e, _f;
-    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
-    if (cache) {
-      if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
-        return {
-          dateList: cache.dateList,
-          firstAvailableDate: cache.firstAvailableDate
-        };
-      }
-    }
     let { startDate, endDate } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
+    const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -2012,6 +2007,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: tempResourceIds
       }
     });
+    const cache = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["timeSlotBySchedule"];
+    if (cache) {
+      if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
+        return {
+          dateList: cache.dateList,
+          firstAvailableDate: cache.firstAvailableDate
+        };
+      }
+    }
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
@@ -2019,6 +2023,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
+    allProductResources.forEach((m) => {
+      var _a2, _b2;
+      const resource = (_b2 = (_a2 = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b2.find(
+        (n) => n.id === m.form_id
+      );
+      if (resource) {
+        m.resourceType = resource.type;
+      }
+    });
     const targetSchedules = this.store.schedule.getScheduleListByIds(
       tempProducts["schedule.ids"]
     );

package/package.json

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