@pisell/pisellos 3.0.41 → 3.0.43

package/dist/modules/Schedule/index.js

@@ -17,6 +17,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { cloneDeep } from 'lodash-es';
 import { BaseModule } from "../BaseModule";
+import dayjs from 'dayjs';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import { generateMonthDates, disableAllDates, disableDatesBeforeOneDay } from "../Date/utils";
+dayjs.extend(isSameOrBefore);
+dayjs.extend(isSameOrAfter);
 export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(ScheduleModule, _BaseModule);
   var _super = _createSuper(ScheduleModule);
@@ -26,6 +32,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
     _this = _super.call(this, name, version);
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'schedule');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
+    _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", {});
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
@@ -41,6 +48,15 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               this.core = core;
+
+              // 获取依赖的插件
+              this.request = core.getPlugin('request');
+              if (this.request) {
+                _context.next = 4;
+                break;
+              }
+              throw new Error('ScheduleModule 需要 request 插件支持');
+            case 4:
               // if (options?.initialState) {
               //   this.state = { ...this.state, ...options.initialState }
               // }
@@ -59,7 +75,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
               if ((_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
-            case 5:
+            case 8:
             case "end":
               return _context.stop();
           }
@@ -70,11 +86,115 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 加载当前店铺下所有 schedule
+     *
+     * @memberof ScheduleModule
+     */
+  }, {
+    key: "loadAllSchedule",
+    value: (function () {
+      var _loadAllSchedule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _scheduleList$data;
+        var scheduleList;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.request.get("/schedule", {
+                num: 999
+              }, {
+                useCache: true
+              });
+            case 2:
+              scheduleList = _context2.sent;
+              this.setScheduleList(((_scheduleList$data = scheduleList.data) === null || _scheduleList$data === void 0 ? void 0 : _scheduleList$data.list) || []);
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function loadAllSchedule() {
+        return _loadAllSchedule.apply(this, arguments);
+      }
+      return loadAllSchedule;
+    }())
   }, {
     key: "setScheduleList",
     value: function setScheduleList(list) {
       this.store.scheduleList = list;
     }
+  }, {
+    key: "loadScheduleAvailableDate",
+    value: function () {
+      var _loadScheduleAvailableDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+        var _res$data$date_list, _res$data$other_produ, _res$data$other_produ2;
+        var startDate, endDate, custom_page_id, channel, dates, res;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              startDate = _ref.startDate, endDate = _ref.endDate, custom_page_id = _ref.custom_page_id, channel = _ref.channel;
+              // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天，需要把 startDate 置为今天
+              if (dayjs(startDate).isBefore(dayjs(), 'day')) {
+                startDate = dayjs().format('YYYY-MM-DD');
+              }
+              // 1.生成当前月份的所有日期，默认都不可用
+              dates = generateMonthDates(startDate, endDate);
+              dates = disableAllDates(dates);
+              // 如果 endDate 在今天之前，则不用查接口，直接返回 dates
+              if (!dayjs(endDate).isBefore(dayjs(), 'day')) {
+                _context3.next = 6;
+                break;
+              }
+              return _context3.abrupt("return", dates);
+            case 6:
+              _context3.next = 8;
+              return this.request.get("/schedule/product/availability/v2", {
+                start_date: startDate,
+                end_date: endDate,
+                custom_page_id: custom_page_id,
+                channel: channel
+              });
+            case 8:
+              res = _context3.sent;
+              this.setAvailabilityScheduleDateList(res.data.date_list);
+              this.setOtherProductsIds(res.data.other_product_ids || []);
+              // 如果没有schedule或者结束日期在今天之前，则所有日期均不可用
+              if (!(!((_res$data$date_list = res.data.date_list) !== null && _res$data$date_list !== void 0 && _res$data$date_list.length) && !((_res$data$other_produ = res.data.other_product_ids) !== null && _res$data$other_produ !== void 0 && _res$data$other_produ.length) || dayjs(endDate).isBefore(dayjs(), 'day'))) {
+                _context3.next = 13;
+                break;
+              }
+              return _context3.abrupt("return", dates);
+            case 13:
+              if ((_res$data$other_produ2 = res.data.other_product_ids) !== null && _res$data$other_produ2 !== void 0 && _res$data$other_produ2.length) {
+                // 如果后端有返回 other_product_ids ，意味着有 duration 商品，则今天以及今天以后的日期均可用
+                dates.forEach(function (n) {
+                  n.status = 'available';
+                });
+              } else {
+                res.data.date_list.forEach(function (n) {
+                  var index = dates.findIndex(function (m) {
+                    return m.date === n.date;
+                  });
+                  if (index !== -1) {
+                    dates[index].status = 'available';
+                  }
+                });
+              }
+              dates = disableDatesBeforeOneDay(dates);
+              return _context3.abrupt("return", dates);
+            case 16:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function loadScheduleAvailableDate(_x3) {
+        return _loadScheduleAvailableDate.apply(this, arguments);
+      }
+      return loadScheduleAvailableDate;
+    }()
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
@@ -112,7 +232,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: store,
-          cacheKey: ['scheduleList', 'availabilityDateList']
+          cacheKey: ['scheduleList', 'availabilityDateList', 'otherProductsIds']
         });
       }
     }

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

@@ -9,6 +9,19 @@ export type ScheduleAvailabilityDateItem = {
     schedule_id: number[];
     product_ids: number[];
 };
+/**
+ * 加载日程可用日期参数接口
+ */
+export interface LoadScheduleAvailableDateParams {
+    /** 开始日期 */
+    startDate: string;
+    /** 结束日期 */
+    endDate: string;
+    /** 自定义页面ID */
+    custom_page_id?: number;
+    /** 渠道 */
+    channel?: string;
+}
 export interface ScheduleModuleAPI {
 }
 export type ScheduleItem = {

package/dist/modules/Schedule/utils.js

@@ -140,7 +140,11 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+      // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
+      if (_end.isAfter(deadline, 'day')) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format('YYYY-MM-DD'))) {
           startTmp = startTmp.day(1).add(frequency, 'day');

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

@@ -8,6 +8,7 @@ import { IStep } from '../../modules/Step/tyeps';
 import { TimeSliceItem, ResourceItem } from './utils/resources';
 import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
+import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -42,26 +43,70 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 更新step
      */
     updateStep(key: string, step: IStep): void;
+    /**
+     *
+     * 加载商品，然后导到商品列表里去
+     * @param {({
+     *     category_ids?: number[];
+     *     product_ids?: number[];
+     *     collection?: number | string[];
+     *     schedule_date?: string;
+     *   })} {
+     *     category_ids = [],
+     *     product_ids = [],
+     *     collection = [],
+     *     schedule_date,
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
     loadProducts({ category_ids, product_ids, collection, schedule_date, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
         schedule_date?: string;
     }): Promise<any>;
+    /**
+     * 通过 schedule 来读取商品，适用于 session 类商品
+     *
+     * @param {{
+     *     date: string;
+     *     product_ids?: number[];
+     *     category_ids?: number[];
+     *   }} {
+     *     date,
+     *     product_ids = [],
+     *     category_ids = [],
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
     loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
         product_ids?: number[];
         category_ids?: number[];
     }): Promise<any>;
+    /**
+     * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
+     *
+     * @param {string} date
+     * @memberof BookingByStepImpl
+     */
     updateQuotationPriceAndCart(date: string): Promise<void>;
-    loadAllSchedule(): Promise<void>;
-    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: {
-        startDate: string;
-        endDate: string;
-        custom_page_id?: number;
-        channel?: string;
-    }): Promise<ITime[]>;
-    storeProduct(productData: ProductData): Promise<void>;
+    /**
+     * ui 层提供日期的起始范围，返回一个起始范围内日期的可用情况
+     * 适用于先选日期的流程，确定日期是否可用
+     * 已知问题：如果挂接的商品的资源不可用，后端是不会计算的
+     *
+     * @param {LoadScheduleAvailableDateParams} {
+     *     startDate,
+     *     endDate,
+     *     custom_page_id,
+     *     channel,
+     *   }
+     * @memberof BookingByStepImpl
+     */
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<ITime[]>;
     addAccount(account: Account | IHolder, extra?: {
         type: 'account' | 'holder';
         customerId: number;
@@ -73,7 +118,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getAccounts(): Promise<(Account | null)[]>;
     checkHasLoginAccount(): boolean;
     setActiveAccount(id: string): void;
-    getActiveAccount(): Account | null;
+    getActiveAccount(): Account | undefined;
     removeAccount(id: string): void;
     /**
      * 获取holder类型账户列表
@@ -86,6 +131,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getCart(): CartItem[];
     getAvailableDate(params?: {
         url?: string;
+        useCache?: boolean;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;
@@ -126,7 +172,60 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         cover?: boolean;
     }): Promise<void>;
     getOtherParams(): Promise<Record<string, any>>;
+    /**
+     * 往购物车加商品数据(duration 类、普通商品)
+     * 老接口，先不删，怕 UI 有问题，直接桥接到新接口addProductToCart上
+     *
+     * @param {ProductData} productData
+     * @memberof BookingByStepImpl
+     */
+    storeProduct(productData: ProductData): Promise<void>;
+    /**
+     * 往购物车加商品数据
+     *
+     * @param {({
+     *     product: ProductData;
+     *     date?: { startTime: string; endTime: string } | null;
+     *     account?: Account | null;
+     *   })} {
+     *     product,
+     *     date,
+     *     account,
+     *   }
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    addProductToCart({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): void;
+    /**
+     * 添加完购物车以后做的一些检测，比如日期是否在同一天
+     *
+     * @param {({ date?: { startTime: string; endTime: string } | null })} { date }
+     * @memberof BookingByStepImpl
+     */
+    addProductCheck({ date, }: {
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+    }): void;
+    beforeUpdateCart(params: IUpdateItemParams, targetCartItem: CartItem): void;
     updateCart(params: IUpdateItemParams): void;
+    /**
+     * 更新购物车以后的一些操作，比如检测资源是否重复，检测资源容量是否足够
+     *
+     * @param {IUpdateItemParams} params
+     * @param {CartItem} targetCartItem
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
+    updateCartCheck(params: IUpdateItemParams, targetCartItem: CartItem): void;
     deleteCart(cartItemId: string): void;
     clearCart(): void;
     clearCartByAccount(account_id: string): void;
@@ -147,7 +246,20 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
+    /**
+     * 在日期那边点击下一步的时候，检查这一天购物车里的商品是不是都有资源可以用
+     *
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
     checkResourceListForDate(): boolean;
+    /**
+     * 给单个购物车里的商品获取资源列表，给 UI 用的
+     *
+     * @param {(string | number)} id
+     * @return {*}
+     * @memberof BookingByStepImpl
+     */
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;
         _id: string;
@@ -156,11 +268,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         holder_id: string | number | undefined;
         holder_name: string | undefined;
     } | undefined;
-    getResourceTimeSlot({ product, resources, currentResourceId, }: {
-        product: ProductData;
-        resources: any[];
-        currentResourceId: number;
-    }): TimeSliceItem[];
     autoSelectAccountResources({ cartItem, holder_id, resources_code, timeSlots, countMap, capacity, }: {
         cartItem: CartItem;
         holder_id: string;
@@ -204,14 +311,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
     }[];
-    addProductToCart({ product, date, account, }: {
-        product: ProductData;
-        date: {
-            startTime: string;
-            endTime: string;
-        };
-        account: Account;
-    }): void;
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
@@ -235,14 +334,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
     }): Promise<Record<string, TimeSliceItem[]>>;
-    getAvailableDateForSession(params?: {
-        startDate?: string;
-        endDate?: string;
-        type?: 'month';
-    }): Promise<{
-        dateList: ITime[];
-        firstAvailableDate: ITime | undefined;
-    }>;
     getAvailableDateForSessionOptimize(params?: {
         startDate?: string;
         endDate?: string;