@pisell/pisellos 3.0.9 → 3.0.10

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

@@ -50,10 +50,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

@@ -314,11 +314,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 +337,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 +351,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 +1194,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'),
@@ -1213,7 +1212,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 return res.usable;
               });
-              return canUseTime;
+              // 在已经选定时间的情况下，只要canUseTime 里有一个 false，那就代表不可用
+              return !canUseArr.some(function (n) {
+                return n === false;
+              });
             });
           });
         } else {
@@ -1841,7 +1843,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
               resourcesUseableMap[m.id] = res.usable;
             }
-            // 如果资源可用，且是独占资源，remainingCapacity 始终为 1
             if (res.usable && res.remainingCapacity >= count) {
               count = res.remainingCapacity;
             }

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

@@ -50,10 +50,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

@@ -208,7 +208,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 +225,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 +234,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 +646,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"),
@@ -664,7 +664,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               }
               return res.usable;
             });
-            return canUseTime;
+            return !canUseArr.some((n2) => n2 === false);
           });
         });
       } else {

package/package.json

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