@pisell/pisellos 3.0.5 → 3.0.6

package/lib/modules/Summary/index.js

@@ -36,6 +36,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.shopStore = this.core.getPlugin("shopStore");
+    this.request = this.core.getPlugin("request");
     if (options.initialState) {
       this.store.summary = options.initialState.summary;
     }
@@ -57,9 +58,22 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.summary = summary;
     return this.store.summary;
   }
+  /**
+   * 获取协议
+   * @param protocolId 协议ID
+   * @returns 协议
+   */
+  async getProtocol(protocolId) {
+    return this.request.get(`/shop-policy/${protocolId}`);
+  }
   storeChange() {
     if (this.openCache) {
-      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["summary"] });
+      this.checkSaveCache({
+        cacheId: this.cacheId,
+        fatherModule: this.fatherModule,
+        store: this.store,
+        cacheKey: ["summary"]
+      });
     }
   }
 };

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

@@ -1,13 +1,34 @@
-import { CartItem } from "../Cart/types";
+import { CartItem } from '../Cart/types';
 export interface ISummaryState {
     summary: {
+        /** 商品总价 */
         subtotal: string | number;
+        /** 最终总价 */
         total: string | number;
+        /** 税率标题 */
         taxTitle?: string;
+        /** 商品总费率 */
         totalTaxFee?: string | number;
+        /** 商品价格是否包含费率 */
         isPriceIncludeTax?: 0 | 1;
+        /** 定金 */
+        deposit?: {
+            /** 定金总价 */
+            total?: string | number;
+            /**  */
+            policies?: IProtocol[];
+        };
     };
 }
+/**
+ * 定金协议
+ */
+export interface IProtocol {
+    /** 协议名称 */
+    title: string;
+    /** 协议id */
+    id: string;
+}
 export interface ISummaryModuleAPI {
-    getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    getSummary(cartItems: CartItem[]): Promise<ISummaryState['summary']>;
 }

package/lib/modules/Summary/utils.d.ts

@@ -1,7 +1,7 @@
-import Decimal from "decimal.js";
-import { CartItem } from "../Cart/types";
-import { ISummaryState } from "./types";
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState["summary"];
+import Decimal from 'decimal.js';
+import { CartItem } from '../Cart/types';
+import { ISummaryState } from './types';
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState['summary'];
 /**
  * 计算商品小计（不含其他费用）
  * @param items - 购物车商品数组
@@ -17,3 +17,13 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @Author: xiangfeng.xue
  */
 export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export declare const calculateDeposit: (items: CartItem[]) => {
+    total: string;
+    protocols: any[];
+    hasDeposit: never;
+} | undefined;

package/lib/modules/Summary/utils.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Summary/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  calculateDeposit: () => calculateDeposit,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee
@@ -39,12 +40,14 @@ var calculatePriceDetails = (shopInfo, items) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
+  const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
-    isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
+    isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax,
+    deposit
   };
 };
 var calculateSubtotal = (items) => {
@@ -70,8 +73,34 @@ var calculateTaxFee = (shopInfo, items) => {
   }, new import_decimal.default(0));
   return totalTaxFee;
 };
+var calculateDeposit = (items) => {
+  if (!(items == null ? void 0 : items.length)) {
+    return void 0;
+  }
+  const protocols = [];
+  let hasDeposit = false;
+  const total = items.reduce((sum, item) => {
+    var _a, _b, _c;
+    if (item == null ? void 0 : item.deposit) {
+      hasDeposit = true;
+      const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
+      (_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
+        if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
+          protocols.push(protocol);
+        }
+      });
+      return sum.plus(cartItemTotalPrice);
+    }
+    return sum;
+  }, new import_decimal.default(0));
+  if (hasDeposit) {
+    return { total: total.toFixed(2), protocols, hasDeposit };
+  }
+  return void 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  calculateDeposit,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee

package/lib/modules/index.d.ts

@@ -1,3 +1,13 @@
 export * from './Product';
 export * from './ProductList';
 export * from './Cart';
+export * from './Account';
+export * from './AccountList';
+export * from './Date';
+export * from './Guests';
+export * from './Order';
+export * from './Payment';
+export * from './Resource';
+export * from './Step';
+export * from './Summary';
+export * from './Schedule';

package/lib/modules/index.js

@@ -19,9 +19,29 @@ module.exports = __toCommonJS(modules_exports);
 __reExport(modules_exports, require("./Product"), module.exports);
 __reExport(modules_exports, require("./ProductList"), module.exports);
 __reExport(modules_exports, require("./Cart"), module.exports);
+__reExport(modules_exports, require("./Account"), module.exports);
+__reExport(modules_exports, require("./AccountList"), module.exports);
+__reExport(modules_exports, require("./Date"), module.exports);
+__reExport(modules_exports, require("./Guests"), module.exports);
+__reExport(modules_exports, require("./Order"), module.exports);
+__reExport(modules_exports, require("./Payment"), module.exports);
+__reExport(modules_exports, require("./Resource"), module.exports);
+__reExport(modules_exports, require("./Step"), module.exports);
+__reExport(modules_exports, require("./Summary"), module.exports);
+__reExport(modules_exports, require("./Schedule"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
   ...require("./ProductList"),
-  ...require("./Cart")
+  ...require("./Cart"),
+  ...require("./Account"),
+  ...require("./AccountList"),
+  ...require("./Date"),
+  ...require("./Guests"),
+  ...require("./Order"),
+  ...require("./Payment"),
+  ...require("./Resource"),
+  ...require("./Step"),
+  ...require("./Summary"),
+  ...require("./Schedule")
 });

package/lib/plugins/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./request";
-export * from "./window";
-export * from "./shopStore";
+export * from './request';
+export * from './window';
+export * from './shopStore';

package/lib/plugins/request.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../types";
+import { Plugin } from '../types';
 /**
  * RequestPlugin 接口定义
  */
@@ -40,13 +40,13 @@ export interface RequestPlugin extends Plugin {
  */
 export interface RequestOptions {
     url?: string;
-    method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "HEAD" | "OPTIONS";
+    method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | 'OPTIONS';
     headers?: Record<string, string>;
     data?: any;
     body?: any;
     params?: Record<string, string | number | boolean>;
     timeout?: number;
-    responseType?: "json" | "text" | "arraybuffer" | "blob";
+    responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
 }

package/lib/plugins/request.js

@@ -148,11 +148,16 @@ var RequestPluginImpl = class {
       try {
         config = await Promise.resolve(interceptor(config));
       } catch (error) {
-        const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "请求拦截器错误", config);
+        const requestError = error instanceof RequestError ? error : new RequestError(
+          error instanceof Error ? error.message : "请求拦截器错误",
+          config
+        );
         let processedError = requestError;
         for (const errorInterceptor of this.interceptors.error) {
           try {
-            processedError = await Promise.resolve(errorInterceptor(processedError));
+            processedError = await Promise.resolve(
+              errorInterceptor(processedError)
+            );
           } catch (e) {
           }
         }
@@ -164,13 +169,22 @@ var RequestPluginImpl = class {
       let processedResponse = response;
       for (const interceptor of this.interceptors.response) {
         try {
-          processedResponse = await Promise.resolve(interceptor(processedResponse));
+          processedResponse = await Promise.resolve(
+            interceptor(processedResponse)
+          );
         } catch (error) {
-          const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "响应拦截器错误", config, null, response);
+          const requestError = error instanceof RequestError ? error : new RequestError(
+            error instanceof Error ? error.message : "响应拦截器错误",
+            config,
+            null,
+            response
+          );
           let processedError = requestError;
           for (const errorInterceptor of this.interceptors.error) {
             try {
-              processedError = await Promise.resolve(errorInterceptor(processedError));
+              processedError = await Promise.resolve(
+                errorInterceptor(processedError)
+              );
             } catch (e) {
             }
           }
@@ -179,11 +193,16 @@ var RequestPluginImpl = class {
       }
       return processedResponse.data;
     } catch (error) {
-      const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : "请求错误", config);
+      const requestError = error instanceof RequestError ? error : new RequestError(
+        error instanceof Error ? error.message : "请求错误",
+        config
+      );
       let processedError = requestError;
       for (const errorInterceptor of this.interceptors.error) {
         try {
-          processedError = await Promise.resolve(errorInterceptor(processedError));
+          processedError = await Promise.resolve(
+            errorInterceptor(processedError)
+          );
         } catch (e) {
         }
       }
@@ -195,13 +214,24 @@ var RequestPluginImpl = class {
    * 这里实现了一个基于 fetch API 的请求
    */
   async performRequest(config) {
-    const { url, method, headers, data, params, timeout, responseType, withCredentials } = config;
+    const {
+      url,
+      method,
+      headers,
+      data,
+      params,
+      timeout,
+      responseType,
+      withCredentials
+    } = config;
     if (!url) {
       throw new RequestError("URL不能为空", config);
     }
     let fullUrl = url;
     if (params && Object.keys(params).length > 0) {
-      const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`).join("&");
+      const queryString = Object.entries(params).map(
+        ([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`
+      ).join("&");
       fullUrl += (url.includes("?") ? "&" : "?") + queryString;
     }
     const fetchOptions = {
@@ -230,7 +260,9 @@ var RequestPluginImpl = class {
       }
     });
     try {
-      const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(new RequestError("当前环境不支持 fetch API", config));
+      const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(
+        new RequestError("当前环境不支持 fetch API", config)
+      );
       const response = await Promise.race([fetchPromise, timeoutPromise]);
       const responseHeaders = {};
       response.headers.forEach((value, key) => {
@@ -264,7 +296,12 @@ var RequestPluginImpl = class {
         config
       };
       if (!response.ok) {
-        throw new RequestError(`请求失败，状态码: ${response.status}`, config, fetchOptions, result);
+        throw new RequestError(
+          `请求失败，状态码: ${response.status}`,
+          config,
+          fetchOptions,
+          result
+        );
       }
       return result;
     } finally {

package/lib/plugins/shopStore.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../types";
+import { Plugin } from '../types';
 export interface ShopStorePlugin extends Plugin {
     get(model: string): any;
 }

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

@@ -1,12 +1,14 @@
-import { Module, PisellCore } from "../../types";
-import { BaseModule } from "../../modules/BaseModule";
-import { Response } from "../../plugins";
-import { BookingByStepState } from "./types";
-import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
-import { Account } from "../../modules/Account/types";
-import { IStep } from "../../modules/Step/tyeps";
-import { TimeSliceItem } from "./utils/resources";
-import { ITime } from "../../modules/Date/types";
+import { Module, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { Response } from '../../plugins';
+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 { ITime } from '../../modules/Date/types';
+import dayjs from 'dayjs';
+import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -17,6 +19,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private store;
     private otherParams;
     private cacheId;
+    private otherData;
     initialize(core: PisellCore, options: any): Promise<void>;
     initStep(stepList: (keyof BookingByStepState)[]): void;
     getCurrentStep(): {
@@ -27,26 +30,60 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     back(): void;
     gotoStep(index: number): void;
     getStepList(): IStep[];
-    loadProducts({ category_ids, product_ids, collection, }: {
+    /**
+     * 添加step
+     */
+    addStep(step: IStep, key?: string): void;
+    /**
+     * 删除step
+     */
+    removeStep(key: string): void;
+    loadProducts({ category_ids, product_ids, collection, schedule_ids, }: {
         category_ids?: number[];
         product_ids?: number[];
         collection?: number | string[];
+        schedule_ids?: number[];
+    }): Promise<any>;
+    loadProductByScheduleDate({ date, product_ids, category_ids, }: {
+        date: string;
+        product_ids?: number[];
+        category_ids?: number[];
     }): Promise<any>;
+    loadAllSchedule(): Promise<void>;
+    loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {
+        startDate: string;
+        endDate: string;
+        custom_page_id?: number;
+    }): Promise<ITime[]>;
     storeProduct(productData: ProductData): Promise<void>;
-    addAccount(accounts: Account[]): Promise<void>;
+    addAccount(account: Account | IHolder, extra?: {
+        type: 'account' | 'holder';
+        customerId: number;
+    }): Promise<Account | null>;
+    addAccounts(accounts: Account[] | IHolder[], extra?: {
+        type: 'account' | 'holder';
+        customerId: number;
+    }): Promise<Account[] | undefined>;
     getAccounts(): Promise<(Account | null)[]>;
     checkHasLoginAccount(): boolean;
     setActiveAccount(id: string): void;
     getActiveAccount(): Account | null;
     removeAccount(id: string): void;
+    /**
+     * 获取holder类型账户列表
+     * @param params
+     */
+    fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
     getCart(): CartItem[];
     getAvailableDate(params?: {
+        url?: string;
         products?: ProductData[];
         startDate?: string;
         endDate?: string;
+        type?: 'month' | 'day';
     }): Promise<ITime[]>;
     /**
      * 获取购物车汇总信息
@@ -57,11 +94,25 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;
+        deposit?: {
+            total?: string | number | undefined;
+            policies?: import("../../modules/Summary/types").IProtocol[] | undefined;
+        } | undefined;
     }>;
+    /**
+     * 获取协议
+     */
+    getProtocol(protocolId: string): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;
     getFreeProduct(id: string | number): Promise<Response<any>>;
+    /**
+     * 检查购物车提交订单前是否符合条件
+     * @param type 类型 "holder" | "account"
+     * @returns boolean
+     */
+    checkBeforeSubmitOrder(type: 'holder' | 'account'): boolean;
     submitOrder(): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;
@@ -80,7 +131,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     /**
      * 从购物车中按类别删除信息
      */
-    deleteCartItemInfo(types: "resource" | "time"): void;
+    deleteCartItemInfo(type: ECartItemInfoType, _id?: string): void;
+    checkCartItemByType(cartItem: CartItem, type: ECartItemCheckType): boolean;
+    /**
+     * 检查购物车商品是否符合条件
+     * @param type 类型
+     * @returns 不符合条件的购物车商品ID列表
+     */
+    checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
@@ -96,22 +154,12 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         resources: any[];
         currentResourceId: number;
     }): TimeSliceItem[];
-    autoSelectResource({ resourceProductData, resources, timeSlots, }: {
-        resourceProductData: any;
-        resources: any[];
-        timeSlots?: TimeSliceItem;
-    }): {
-        selectedResource: any;
-        timeSlots?: undefined;
-    } | {
-        timeSlots: any[];
-        selectedResource: any;
-    } | undefined;
-    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, }: {
+    autoSelectAccountResources({ holder_id, resources_code, timeSlots, countMap, capacity, }: {
         holder_id: string;
         resources_code: string | number;
         timeSlots?: TimeSliceItem;
         countMap: Record<number, number>;
+        capacity?: number;
     }): {
         selectedResource: any;
         timeSlots?: undefined;
@@ -126,4 +174,29 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     clearCache(): void;
     clearCacheByModule(module: string): void;
+    private getScheduleDataByIds;
+    openProductDetail(productId: number): Promise<void>;
+    closeProductDetail(): void;
+    getTimeslotBySchedule({ date, scheduleIds, resources, }: {
+        date: string;
+        scheduleIds?: number[];
+        resources?: ProductResourceItem[];
+    }): {
+        start_time: string;
+        end_time: string;
+        start_at: dayjs.Dayjs;
+        end_at: dayjs.Dayjs;
+        count: 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">;
 }