@pisell/pisellos 0.0.14 → 0.0.16

package/lib/modules/Cart/index.js

@@ -24,7 +24,6 @@ __export(Cart_exports, {
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
-var import_types = require("./types");
 var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 __reExport(Cart_exports, require("./types"), module.exports);
@@ -34,14 +33,27 @@ var CartModule = class extends import_BaseModule.BaseModule {
     // 提供给 baseModule 用的默认名称 和 默认版本
     this.defaultName = "cart";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   /**
    * 初始化购物车模块
    */
   async initialize(core, options) {
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
-    this.store.list = [];
+    if (Array.isArray((_a = options.initialState) == null ? void 0 : _a.list)) {
+      this.store.list = options.initialState.list;
+    } else {
+      this.store.list = [];
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_c = options.otherParams) == null ? void 0 : _c.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
@@ -50,7 +62,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
     if (!this.window) {
       throw new Error("购物车模块需要 window 插件支持");
     }
-    this.store.temp = {};
     console.log("[CartModule] 初始化完成");
   }
   /**
@@ -71,8 +82,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
     }
     const items = [...this.store.list, cartItem];
     this.store.list = items;
-    await this.core.effects.emit(import_types.CartHooks.OnAddItem, cartItem);
-    await this.core.effects.emit(`${this.name}:changed`, items);
+    await this.core.effects.emit(`${this.name}:onAddItem`, cartItem);
   }
   /**
    * 更新购物车信息
@@ -87,8 +97,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
         return item;
       });
       this.store.list = [...items];
-      await this.core.effects.emit(import_types.CartHooks.OnCartUpdateItem, tempCartItem);
-      await this.core.effects.emit(`${this.name}:changed`, items);
+      await this.core.effects.emit(`${this.name}:onUpdateItem`, tempCartItem);
     } catch (error) {
       console.error("[CartModule] 更新购物车商品失败", error);
     }
@@ -127,8 +136,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 批量设置购物车数据
    */
   async batchSetItems(items) {
-    this.store.list = items || [];
-    await this.core.effects.emit(`${this.name}:changed`, items);
+    this.store.list = [...items || []];
   }
   /**
    * 获取购物车商品
@@ -136,25 +144,40 @@ var CartModule = class extends import_BaseModule.BaseModule {
   getItems() {
     return this.store.list;
   }
+  /**
+   * 根据账户ID获取购物车
+   */
+  getCartByAccount(account_id) {
+    return this.store.list.filter((item) => item.holder_id === account_id);
+  }
   /**
    * 移除购物车商品
    */
   async removeItem(id) {
     const items = this.store.list.filter((i) => i._id !== id);
     this.store.list = items;
-    await this.core.effects.emit(import_types.CartHooks.OnCartRemove, items);
+    await this.core.effects.emit(`${this.name}:onRemoveItem`, items);
   }
   /**
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    this.store.list = this.store.list.filter((item) => item.holder_id !== account_id);
+    const items = this.store.list.filter((item) => item.holder_id !== account_id);
+    this.store.list = [...items || []];
   }
   /**
-   * 根据账户ID获取购物车
+   * 清除购物车商品中的信息
    */
-  getCartByAccount(account_id) {
-    return this.store.list.filter((item) => item.holder_id === account_id);
+  deleteCartItemInfo(types) {
+    const list = this.store.list.map((item) => {
+      if (types === "resource") {
+        item = (0, import_utils.deleteResourceFromCartItem)(item);
+      } else if (types === "time") {
+        item = (0, import_utils.deleteTimeFromCartItem)(item);
+      }
+      return item;
+    });
+    this.store.list = [...list];
   }
   /**
    * 清除购物车
@@ -162,6 +185,11 @@ var CartModule = class extends import_BaseModule.BaseModule {
   clear() {
     this.store.list = [];
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["list"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -88,14 +88,14 @@ export interface CartItem {
     _origin: any;
     /** 商品原始数据 */
     _productOrigin?: ProductData;
+    /** 资源原始数据 */
+    _resourceOrigin?: Resource[];
 }
 /**
  * 购物车状态接口
  */
 export interface CartState {
     list: CartItem[];
-    total: number;
-    temp: Record<string, any>;
 }
 /**
  * 添加商品到购物车参数

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

@@ -90,6 +90,18 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 从购物车中删除资源相关信息
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteResourceFromCartItem: (cartItem: CartItem) => CartItem;
+/**
+ * 从购物车中删除时间
+ * @param cartItem 购物车
+ * @returns 删除后的购物车
+ */
+export declare const deleteTimeFromCartItem: (cartItem: CartItem) => CartItem;
 /**
  * 格式化备注到购物车
  * @param params 参数

package/lib/modules/Cart/utils.js

@@ -30,6 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   createCartItemOrigin: () => createCartItemOrigin,
+  deleteResourceFromCartItem: () => deleteResourceFromCartItem,
+  deleteTimeFromCartItem: () => deleteTimeFromCartItem,
   formatAccountToCartItem: () => formatAccountToCartItem,
   formatAccountToCartItemOrigin: () => formatAccountToCartItemOrigin,
   formatBundle: () => formatBundle,
@@ -196,6 +198,7 @@ var formatResourceToCartItem = (params) => {
   }
   const oringin = formatResourceToCartItemOrigin(params);
   cartItem._origin = oringin;
+  cartItem._resourceOrigin = resources;
   return cartItem;
 };
 var formatResourceToCartItemOrigin = (params) => {
@@ -226,6 +229,34 @@ var formatResourceToCartItemOrigin = (params) => {
   }
   return origin;
 };
+var deleteResourceFromCartItem = (cartItem) => {
+  cartItem.resource_id = void 0;
+  cartItem.relation_form_name = void 0;
+  cartItem.start_date = void 0;
+  cartItem.start_time = void 0;
+  cartItem.end_date = void 0;
+  cartItem.end_time = void 0;
+  delete cartItem._resourceOrigin;
+  cartItem._origin.resources = null;
+  cartItem._origin.select_date = null;
+  cartItem._origin.start_date = null;
+  cartItem._origin.start_time = null;
+  cartItem._origin.end_date = null;
+  cartItem._origin.end_time = null;
+  return cartItem;
+};
+var deleteTimeFromCartItem = (cartItem) => {
+  cartItem.start_date = void 0;
+  cartItem.start_time = void 0;
+  cartItem.end_date = void 0;
+  cartItem.end_time = void 0;
+  cartItem._origin.select_date = null;
+  cartItem._origin.start_date = null;
+  cartItem._origin.start_time = null;
+  cartItem._origin.end_date = null;
+  cartItem._origin.end_time = null;
+  return cartItem;
+};
 var formatNoteToCartItem = (params) => {
   const { cartItem, note } = params;
   cartItem.note = note;
@@ -340,6 +371,8 @@ var getProductOriginTotalPrice = (params) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createCartItemOrigin,
+  deleteResourceFromCartItem,
+  deleteTimeFromCartItem,
   formatAccountToCartItem,
   formatAccountToCartItemOrigin,
   formatBundle,

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

@@ -6,6 +6,9 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     protected defaultVersion: string;
     private store;
     private request;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     setDateRange(dateRange: ITime[]): void;
@@ -13,4 +16,6 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getMonthDates(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     getDateList(): Promise<ITime[]>;
     getAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
+    clearDateRange(): void;
+    storeChange(): void;
 }

package/lib/modules/Date/index.js

@@ -40,14 +40,27 @@ var DateModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "date";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
+    if (options.initialState) {
+      this.store.dateRange = options.initialState.dateRange;
+      this.store.dateList = options.initialState.dateList;
+    }
     if (!this.request) {
       throw new Error("DateModule 需要 request 插件支持");
     }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
   }
   setDateRange(dateRange) {
     this.store.dateRange = dateRange;
@@ -90,6 +103,14 @@ var DateModule = class extends import_BaseModule.BaseModule {
       return (0, import_utils.disableAllDates)(dates);
     }
   }
+  clearDateRange() {
+    this.store.dateRange = [];
+  }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["dateRange", "dateList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -7,6 +7,9 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     private request;
     private window;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setDiscountList(discountList: Discount[]): Promise<void>;
@@ -23,4 +26,5 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     calcDiscountApplicableProductTotalPrice(discount: Discount): number;
     destroy(): Promise<void>;
     clear(): Promise<void>;
+    storeChange(): void;
 }

package/lib/modules/Discount/index.js

@@ -30,10 +30,24 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "discount";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b, _c;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
+    if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.discountList)) {
+      this.store.discountList = options == null ? void 0 : options.initialState.discountList;
+    } else {
+      this.store.discountList = [];
+    }
+    if ((_b = options == null ? void 0 : options.otherParams) == null ? void 0 : _b.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_c = options == null ? void 0 : options.otherParams) == null ? void 0 : _c.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
     if (!this.request) {
@@ -111,6 +125,11 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     this.store.discountList = [];
     console.log("[Discount] clear");
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["discountList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -47,6 +47,9 @@ export interface Discount {
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;
+    discount?: {
+        resource_id: number;
+    };
     isManualSelect?: boolean;
     isDisabled?: boolean;
     isSelected?: boolean;

package/lib/modules/Rules/index.js

@@ -71,7 +71,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const { discount_list } = this.hooks.getProduct(product);
       if (discount_list && discount_list.length > 0) {
         const usedNewDiscount = discount_list.some(
-          (discount) => newDiscountIds.includes(discount.resource_id)
+          (discount) => {
+            var _a;
+            return newDiscountIds.includes((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id);
+          }
         );
         if (usedNewDiscount) {
           hasApplicableDiscount = true;
@@ -135,9 +138,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           applicableProducts.push({
             amount: product.price,
             type: discount.tag,
-            resource_id: discount.id,
-            title: discount.format_title,
-            original_amount: product.origin_total
+            discount: {
+              resource_id: discount.id,
+              title: discount.format_title,
+              original_amount: product.origin_total
+            }
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
         }

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

@@ -5,6 +5,9 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     init(steps: IStep[]): void;
@@ -16,4 +19,5 @@ export declare class StepModule extends BaseModule implements Module, IStepModul
     prevStep(): void;
     nextStep(): void;
     gotoStep(stepIndex: number): void;
+    storeChange(): void;
 }

package/lib/modules/Step/index.js

@@ -28,10 +28,24 @@ var StepModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "step";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
+    if (options.initialState) {
+      this.store.stepList = options.initialState.stepList;
+      this.store.currentStep = options.initialState.currentStep;
+      this.store.currentStepIndex = options.initialState.currentStepIndex;
+    }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
   }
   init(steps) {
     this.setSteps(steps);
@@ -69,6 +83,11 @@ var StepModule = class extends import_BaseModule.BaseModule {
   gotoStep(stepIndex) {
     this.setCurrentStep(stepIndex);
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["currentStepIndex", "currentStep", "stepList"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -7,7 +7,11 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     protected defaultVersion: string;
     private shopStore;
     private store;
+    private cacheId;
+    private openCache;
+    private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    storeChange(): void;
 }

package/lib/modules/Summary/index.js

@@ -29,11 +29,23 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "summary";
     this.defaultVersion = "1.0.0";
+    this.openCache = false;
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.store = options.store;
     this.shopStore = this.core.getPlugin("shopStore");
+    if (options.initialState) {
+      this.store.summary = options.initialState.summary;
+    }
+    if ((_a = options.otherParams) == null ? void 0 : _a.cacheId) {
+      this.openCache = options.otherParams.openCache;
+      this.cacheId = options.otherParams.cacheId;
+    }
+    if ((_b = options.otherParams) == null ? void 0 : _b.fatherModule) {
+      this.fatherModule = options.otherParams.fatherModule;
+    }
     if (!this.shopStore) {
       throw new Error("SummaryModule 需要 shopStore 插件支持");
     }
@@ -45,6 +57,11 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.summary = summary;
     return this.store.summary;
   }
+  storeChange() {
+    if (this.openCache) {
+      this.checkSaveCache({ cacheId: this.cacheId, fatherModule: this.fatherModule, store: this.store, cacheKey: ["summary"] });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/modules/Summary/utils.js

@@ -52,9 +52,8 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
-    const quantity = new import_decimal.default(item.num || 1);
-    return sum.plus(price.times(quantity));
+    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -64,9 +63,9 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
-    const productTaxRate = price.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
+    const productTaxRate = cartItemTotalPrice.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);
   }, new import_decimal.default(0));
   return totalTaxFee;

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

@@ -1,7 +1,7 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
 import { BookingByStepState } from "./types";
-import { IUpdateItemParams, ProductData } from "../../modules";
+import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
 import { IStep } from "../../modules/Step/tyeps";
 import { TimeSliceItem } from "./utils/resources";
@@ -38,8 +38,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getActiveAccount(): Account | null;
     removeAccount(id: string): void;
     setDateRange(dateRange: ITime[]): Promise<void>;
-    getRangeDate(): Promise<string>;
-    getCart(): Promise<import("../../modules").CartItem[]>;
+    clearDateRange(): void;
+    getDateRange(): Promise<ITime[]>;
+    getCart(): Promise<CartItem[]>;
     getAvailableDate(params?: {
         products?: ProductData[];
         startDate?: string;
@@ -66,11 +67,27 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): Promise<void>;
     getOtherParams(): Promise<Record<string, any>>;
     updateCart(params: IUpdateItemParams): void;
-    deleteCart(product_id: string): void;
+    deleteCart(cartItemId: string): void;
     clearCart(): void;
     clearCartByAccount(account_id: string): void;
+    /**
+     * 批量更新购物车
+     */
+    batchUpdateCart(paramsList: IUpdateItemParams[]): void;
+    /**
+     * 从购物车中按类别删除信息
+     */
+    deleteCartItemInfo(types: "resource" | "time"): void;
     destory(): void;
     getResourcesList(): any[];
+    getResourcesListByCartItem(id: string | number): {
+        id: number | undefined;
+        _id: string;
+        product: ProductData | undefined;
+        resources: import("./utils/resources").ResourceItem[];
+        holder_id: string | number | undefined;
+        holder_name: string | undefined;
+    } | undefined;
     getResourceTimeSlot({ product, resources, currentResourceId, }: {
         product: ProductData;
         resources: any[];
@@ -103,4 +120,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     getTimeSlotByAllResources(resources_code: string): any[];
     submitTimeSlot(timeSlots: TimeSliceItem): void;
+    clearCache(): void;
+    clearCacheByModule(module: string): void;
 }