@pisell/pisellos 3.0.32 → 3.0.33

package/dist/modules/Date/index.d.ts

@@ -15,6 +15,8 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getDateRange(): ITime[];
     getResourceDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     getDateList(): ITime[];
+    setDateList(dateList: ITime[]): void;
+    fetchResourceDates(params: IGetAvailableTimeListParams): Promise<any>;
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;

package/dist/modules/Date/index.js

@@ -113,32 +113,23 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
       return this.store.dateList;
     }
   }, {
-    key: "getResourceAvailableTimeList",
+    key: "setDateList",
+    value: function setDateList(dateList) {
+      this.store.dateList = dateList;
+    }
+  }, {
+    key: "fetchResourceDates",
     value: function () {
-      var _getResourceAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var url, query, rules, type, fetchUrl, _ref, start_date, end_date, resource_ids, dates, _res$data, res;
+      var _fetchResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var url, query, fetchUrl, _ref, start_date, end_date, resource_ids, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              url = params.url, query = params.query, rules = params.rules, type = params.type;
+              url = params.url, query = params.query;
               fetchUrl = url || '/schedule/resource/list';
               _ref = query || {}, start_date = _ref.start_date, end_date = _ref.end_date, resource_ids = _ref.resource_ids;
-              if (!(!start_date || !end_date)) {
-                _context3.next = 5;
-                break;
-              }
-              return _context3.abrupt("return", []);
-            case 5:
-              // 1.生成当前月份的所有日期，默认都是可用的
-              dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
-              if (resource_ids !== null && resource_ids !== void 0 && resource_ids.length) {
-                _context3.next = 8;
-                break;
-              }
-              return _context3.abrupt("return", disableAllDates(dates));
-            case 8:
-              _context3.prev = 8;
-              _context3.next = 11;
+              _context3.prev = 3;
+              _context3.next = 6;
               return this.request.get(fetchUrl, {
                 start_date: start_date,
                 end_date: end_date,
@@ -147,14 +138,59 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               }, {
                 useCache: true
               });
-            case 11:
+            case 6:
               res = _context3.sent;
+              return _context3.abrupt("return", res);
+            case 10:
+              _context3.prev = 10;
+              _context3.t0 = _context3["catch"](3);
+              console.error(_context3.t0);
+            case 13:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this, [[3, 10]]);
+      }));
+      function fetchResourceDates(_x4) {
+        return _fetchResourceDates.apply(this, arguments);
+      }
+      return fetchResourceDates;
+    }()
+  }, {
+    key: "getResourceAvailableTimeList",
+    value: function () {
+      var _getResourceAvailableTimeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var query, rules, type, _ref2, start_date, end_date, resource_ids, dates, _res$data, res;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              query = params.query, rules = params.rules, type = params.type;
+              _ref2 = query || {}, start_date = _ref2.start_date, end_date = _ref2.end_date, resource_ids = _ref2.resource_ids;
+              if (!(!start_date || !end_date)) {
+                _context4.next = 4;
+                break;
+              }
+              return _context4.abrupt("return", []);
+            case 4:
+              // 1.生成当前月份的所有日期，默认都是可用的
+              dates = generateMonthDates(start_date, end_date, type); // 如果没有资源或者结束日期在今天之前，则所有日期均不可用
+              if (resource_ids !== null && resource_ids !== void 0 && resource_ids.length) {
+                _context4.next = 7;
+                break;
+              }
+              return _context4.abrupt("return", disableAllDates(dates));
+            case 7:
+              _context4.prev = 7;
+              _context4.next = 10;
+              return this.fetchResourceDates(params);
+            case 10:
+              res = _context4.sent;
               if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.length) {
-                _context3.next = 14;
+                _context4.next = 13;
                 break;
               }
-              return _context3.abrupt("return", disableAllDates(dates));
-            case 14:
+              return _context4.abrupt("return", disableAllDates(dates));
+            case 13:
               // 2.根据资源times判定哪些日期内存在可用资源
               dates = handleAvailableDateByResource(res.data, dates);
 
@@ -162,19 +198,19 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               if (rules !== null && rules !== void 0 && rules.length) {
                 dates = handleAvailableDatesByRules(dates, rules);
               }
-              return _context3.abrupt("return", dates);
-            case 19:
-              _context3.prev = 19;
-              _context3.t0 = _context3["catch"](8);
-              console.log('getAvailableTimeList_error', _context3.t0);
-              return _context3.abrupt("return", disableAllDates(dates));
-            case 23:
+              return _context4.abrupt("return", dates);
+            case 18:
+              _context4.prev = 18;
+              _context4.t0 = _context4["catch"](7);
+              console.log('getAvailableTimeList_error', _context4.t0);
+              return _context4.abrupt("return", disableAllDates(dates));
+            case 22:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[8, 19]]);
+        }, _callee4, this, [[7, 18]]);
       }));
-      function getResourceAvailableTimeList(_x4) {
+      function getResourceAvailableTimeList(_x5) {
         return _getResourceAvailableTimeList.apply(this, arguments);
       }
       return getResourceAvailableTimeList;

package/dist/modules/Rules/index.js

@@ -107,7 +107,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果
-      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList)));
+      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)

package/dist/modules/Schedule/types.d.ts

@@ -6,6 +6,7 @@ export interface ScheduleState {
 export type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
+    product_ids: number[];
 };
 export interface ScheduleModuleAPI {
 }

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

@@ -5,7 +5,7 @@ import { BookingByStepState } from './types';
 import { CartItem, IUpdateItemParams, ProductData, ProductResourceItem, ECartItemInfoType, ECartItemCheckType } from '../../modules';
 import { Account } from '../../modules/Account/types';
 import { IStep } from '../../modules/Step/tyeps';
-import { TimeSliceItem } from './utils/resources';
+import { TimeSliceItem, ResourceItem } from './utils/resources';
 import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
@@ -153,7 +153,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         id: number | undefined;
         _id: string;
         product: ProductData | undefined;
-        resources: import("./utils/resources").ResourceItem[];
+        resources: ResourceItem[];
         holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
@@ -189,7 +189,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, resources, product }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, product, }: {
         date: string;
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
@@ -211,7 +211,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
      *
@@ -221,9 +221,30 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @memberof BookingByStepImpl
      */
     getResourcesByCartItemAndCode(cartItemId: string, resourceCode: string): any;
+    /**
+     * 根据日期范围批量获取时间槽
+     * @param params 参数对象
+     * @returns Promise<Record<string, TimeSliceItem[]>> 返回日期到时间槽的映射
+     */
+    getTimeslotsScheduleByDateRange({ startDate, endDate, scheduleIds, resources, }: {
+        startDate: string;
+        endDate: string;
+        scheduleIds?: number[];
+        resources?: ProductResourceItem[];
+    }): Promise<Record<string, TimeSliceItem[]>>;
     getAvailableDateForSession(params?: {
         startDate?: string;
         endDate?: string;
         type?: 'month';
-    }): Promise<ITime[]>;
+    }): Promise<{
+        dateList: ITime[];
+        firstAvailableDate: ITime | undefined;
+    }>;
+    getAvailableDateForSessionOptimize(params?: {
+        startDate?: string;
+        endDate?: string;
+    }): Promise<{
+        dateList: any;
+        firstAvailableDate: any;
+    }>;
 }