@pisell/pisellos 2.0.39 → 2.0.41

package/lib/modules/Rules/types.d.ts

@@ -37,14 +37,20 @@ type ProductDetail = {
     options?: any[];
     bundle?: any[];
     original_price?: number | string;
+    num?: number;
+    quantity: number;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
     setProduct: (product: Record<string, any>, values: {
+        _id?: string;
         total?: number;
         discount_list: any[];
         origin_total?: number;
-        price?: number;
+        price?: string | number;
+        variant?: any[];
+        original_price?: number;
+        quantity?: number;
     }) => Record<string, any>;
 }
 export {};

package/lib/modules/Schedule/index.d.ts

@@ -1,16 +1,24 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem } from './types';
+import { ScheduleModuleAPI, ScheduleAvailabilityDateItem, ScheduleItem, LoadScheduleAvailableDateParams } from './types';
 export declare class ScheduleModule extends BaseModule implements Module, ScheduleModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
+    private request;
     private store;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 加载当前店铺下所有 schedule
+     *
+     * @memberof ScheduleModule
+     */
+    loadAllSchedule(): Promise<void>;
     setScheduleList(list: ScheduleItem[]): void;
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, channel, }: LoadScheduleAvailableDateParams): Promise<import("../Date/types").ITime[]>;
     getScheduleListByIds(ids: number[]): ScheduleItem[];
     setAvailabilityScheduleDateList(list: ScheduleAvailabilityDateItem[]): void;
     getAvailabilityScheduleDateList(): ScheduleAvailabilityDateItem[];

package/lib/modules/Schedule/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Schedule/index.ts
@@ -24,6 +34,12 @@ __export(Schedule_exports, {
 module.exports = __toCommonJS(Schedule_exports);
 var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
+var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
+var import_utils = require("../Date/utils");
+import_dayjs.default.extend(import_isSameOrBefore.default);
+import_dayjs.default.extend(import_isSameOrAfter.default);
 var ScheduleModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -35,6 +51,10 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
   async initialize(core, options) {
     var _a, _b;
     this.core = core;
+    this.request = core.getPlugin("request");
+    if (!this.request) {
+      throw new Error("ScheduleModule 需要 request 插件支持");
+    }
     this.store = options == null ? void 0 : options.store;
     if (options.initialState) {
       this.store.scheduleList = options.initialState.scheduleList;
@@ -51,9 +71,67 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
+  /**
+   * 加载当前店铺下所有 schedule
+   *
+   * @memberof ScheduleModule
+   */
+  async loadAllSchedule() {
+    var _a;
+    const scheduleList = await this.request.get(
+      `/schedule`,
+      { num: 999 },
+      { useCache: true }
+    );
+    this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
+  }
   setScheduleList(list) {
     this.store.scheduleList = list;
   }
+  async loadScheduleAvailableDate({
+    startDate,
+    endDate,
+    custom_page_id,
+    channel
+  }) {
+    var _a, _b, _c;
+    if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
+      startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
+    }
+    let dates = (0, import_utils.generateMonthDates)(startDate, endDate);
+    dates = (0, import_utils.disableAllDates)(dates);
+    if ((0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+      return dates;
+    }
+    const res = await this.request.get(
+      `/schedule/product/availability/v2`,
+      {
+        start_date: startDate,
+        end_date: endDate,
+        custom_page_id,
+        channel
+      }
+    );
+    this.setAvailabilityScheduleDateList(res.data.date_list);
+    this.setOtherProductsIds(res.data.other_product_ids || []);
+    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+      return dates;
+    }
+    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+      dates.forEach((n) => {
+        n.status = "available";
+      });
+    } else {
+      res.data.date_list.forEach((n) => {
+        const index = dates.findIndex((m) => m.date === n.date);
+        if (index !== -1) {
+          dates[index].status = "available";
+        }
+      });
+    }
+    dates = (0, import_utils.disableDatesBeforeOneDay)(dates);
+    return dates;
+  }
   getScheduleListByIds(ids) {
     return this.store.scheduleList.filter((n) => ids.includes(n.id));
   }
@@ -76,7 +154,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
         store,
-        cacheKey: ["scheduleList", "availabilityDateList"]
+        cacheKey: ["scheduleList", "availabilityDateList", "otherProductsIds"]
       });
     }
   }

package/lib/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/lib/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类型账户列表
@@ -126,7 +171,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 +245,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 +267,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 +310,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 +333,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;