@pisell/pisellos 0.0.13 → 0.0.14

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

@@ -5,13 +5,12 @@ export * from "./types";
 /**
  * 购物车模块实现
  */
-export declare class CartModule extends BaseModule implements Module {
+export declare class CartModule extends BaseModule implements Module, CartModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
     private request;
     private window;
     private store;
-    exports: CartModuleAPI;
     constructor(name?: string, version?: string);
     /**
      * 初始化购物车模块
@@ -25,17 +24,32 @@ export declare class CartModule extends BaseModule implements Module {
      * 更新购物车信息
      */
     updateItem(params: IUpdateItemParams): Promise<void>;
+    /**
+     * 格式化数据到购物车
+     */
+    formatCartItem(params: IUpdateItemParams): CartItem;
     /**
      * 批量设置购物车数据
      */
     batchSetItems(items: CartItem[]): Promise<void>;
-    getItemCount(): number;
-    getTotalPrice(): number;
+    /**
+     * 获取购物车商品
+     */
     getItems(): CartItem[];
+    /**
+     * 移除购物车商品
+     */
     removeItem(id: string): Promise<void>;
-    storeTemp(key: string, value: any): Promise<void>;
-    getTemp(key?: string): any;
-    clear(): void;
+    /**
+     * 根据账户ID清除购物车
+     */
     clearCartByAccount(account_id: string): void;
+    /**
+     * 根据账户ID获取购物车
+     */
     getCartByAccount(account_id: string | number): CartItem[];
+    /**
+     * 清除购物车
+     */
+    clear(): void;
 }

package/lib/modules/Cart/index.js

@@ -26,6 +26,7 @@ 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);
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -33,15 +34,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
     // 提供给 baseModule 用的默认名称 和 默认版本
     this.defaultName = "cart";
     this.defaultVersion = "1.0.0";
-    // 导出的模块 API
-    this.exports = {
-      addItem: this.addItem.bind(this),
-      getItemCount: this.getItemCount.bind(this),
-      getTotalPrice: this.getTotalPrice.bind(this),
-      getItems: this.getItems.bind(this),
-      updateItem: this.updateItem.bind(this),
-      removeItem: this.removeItem.bind(this)
-    };
   }
   /**
    * 初始化购物车模块
@@ -68,10 +60,10 @@ var CartModule = class extends import_BaseModule.BaseModule {
     const { account, product, bundle, options } = params;
     let cartItem = {
       _id: (0, import_utils.getUniqueId)(),
-      _origin: (0, import_utils.createCartItemOrigin)(),
-      _productOrigin: product
+      _origin: (0, import_utils.createCartItemOrigin)()
     };
     if (product) {
+      cartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
       cartItem = (0, import_utils.formatProductToCartItem)({ cartItem, product, bundle, options });
     }
     if (account) {
@@ -86,77 +78,90 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 更新购物车信息
    */
   async updateItem(params) {
-    var _a;
-    const { _id, cartItem, account, product, resources, note } = params;
+    try {
+      const tempCartItem = this.formatCartItem(params);
+      const items = this.store.list.map((item) => {
+        if (item._id === (tempCartItem == null ? void 0 : tempCartItem._id)) {
+          return tempCartItem;
+        }
+        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);
+    } catch (error) {
+      console.error("[CartModule] 更新购物车商品失败", error);
+    }
+  }
+  /**
+   * 格式化数据到购物车
+   */
+  formatCartItem(params) {
+    const { _id, cartItem, account, product, discounts, resources, note } = params;
     let tempCartItem = this.store.list.find((i) => i._id === _id);
     if (!tempCartItem) {
-      console.warn("[CartModule] 更新购物车商品失败，商品不存在");
-      return;
+      throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
     }
     if (cartItem) {
       tempCartItem = cartItem;
     }
     if (product) {
+      tempCartItem._productOrigin = (0, import_lodash_es.cloneDeep)(product);
       tempCartItem = (0, import_utils.formatProductToCartItem)({ cartItem: tempCartItem, product });
     }
+    if (discounts) {
+      tempCartItem = (0, import_utils.formatDiscountToCartItem)({ cartItem: tempCartItem, discounts });
+    }
     if (account) {
       tempCartItem = (0, import_utils.formatAccountToCartItem)({ cartItem: tempCartItem, account });
     }
     if (resources) {
       tempCartItem = (0, import_utils.formatResourceToCartItem)({ cartItem: tempCartItem, resources });
     }
-    if (note && ((_a = tempCartItem._origin) == null ? void 0 : _a.product)) {
-      tempCartItem.note = note;
-      tempCartItem._origin.product.note = note;
+    if (note) {
+      tempCartItem = (0, import_utils.formatNoteToCartItem)({ cartItem: tempCartItem, note });
     }
-    const items = this.store.list.map((item) => {
-      if (item._id === (tempCartItem == null ? void 0 : tempCartItem._id)) {
-        return tempCartItem;
-      }
-      return item;
-    });
-    this.store.list = items;
-    await this.core.effects.emit(`${this.name}:changed`, items);
+    return tempCartItem;
   }
   /**
    * 批量设置购物车数据
    */
   async batchSetItems(items) {
     this.store.list = items || [];
+    await this.core.effects.emit(`${this.name}:changed`, items);
   }
-  getItemCount() {
-    return this.store.list.length;
-  }
-  getTotalPrice() {
-    return 0;
-  }
+  /**
+   * 获取购物车商品
+   */
   getItems() {
     return this.store.list;
   }
+  /**
+   * 移除购物车商品
+   */
   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);
   }
-  async storeTemp(key, value) {
-    this.store.temp[key] = value;
-    await this.core.effects.emit(`${this.name}:changed`, this.store.temp);
-  }
-  getTemp(key) {
-    if (!key) {
-      return this.store.temp;
-    }
-    return this.store.temp[key];
-  }
-  clear() {
-    this.store.list = [];
-  }
+  /**
+   * 根据账户ID清除购物车
+   */
   clearCartByAccount(account_id) {
     this.store.list = this.store.list.filter((item) => item.holder_id !== account_id);
   }
+  /**
+   * 根据账户ID获取购物车
+   */
   getCartByAccount(account_id) {
     return this.store.list.filter((item) => item.holder_id === account_id);
   }
+  /**
+   * 清除购物车
+   */
+  clear() {
+    this.store.list = [];
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -7,6 +7,26 @@ export declare enum CartHooks {
     OnCartUpdateItem = "card:onCartUpdateItem",
     OnCartRemove = "card:onCartRemove"
 }
+export interface CartModuleAPI {
+    /** 添加商品到购物车 */
+    addItem: (item: IAddItemParams) => Promise<void>;
+    /** 获取购物车商品 */
+    getItems: () => CartItem[];
+    /** 更新购物车商品 */
+    updateItem: (params: IUpdateItemParams) => Promise<void>;
+    /** 格式化购物车商品 */
+    formatCartItem: (params: IUpdateItemParams) => CartItem;
+    /** 批量设置购物车商品 */
+    batchSetItems: (items: CartItem[]) => Promise<void>;
+    /** 移除购物车商品 */
+    removeItem: (id: string) => Promise<void>;
+    /** 根据账户ID清除购物车 */
+    clearCartByAccount: (account_id: string) => void;
+    /** 根据账户ID获取购物车 */
+    getCartByAccount: (account_id: string) => CartItem[];
+    /** 清除购物车 */
+    clear: () => void;
+}
 /**
  * 购物车商品接口
  */
@@ -67,7 +87,7 @@ export interface CartItem {
     /** 原始数据 */
     _origin: any;
     /** 商品原始数据 */
-    _productOrigin: ProductData;
+    _productOrigin?: ProductData;
 }
 /**
  * 购物车状态接口
@@ -77,17 +97,6 @@ export interface CartState {
     total: number;
     temp: Record<string, any>;
 }
-/**
- * 购物车模块 API
- */
-export interface CartModuleAPI {
-    addItem: (item: IAddItemParams) => Promise<void>;
-    getItemCount: () => number;
-    getTotalPrice: () => number;
-    getItems: () => CartItem[];
-    updateItem: (params: IUpdateItemParams) => Promise<void>;
-    removeItem: (id: string) => Promise<void>;
-}
 /**
  * 添加商品到购物车参数
  */
@@ -108,13 +117,15 @@ export interface IAddItemParams {
  */
 export interface IUpdateItemParams {
     /** 购物车_id字段 */
-    _id?: string;
+    _id: string;
     /** 购物车商品 */
     cartItem?: CartItem;
     /** 账户 */
     account?: Account;
     /** 商品 */
     product?: ProductData;
+    /** 折扣列表 */
+    discounts?: IDiscount[];
     /** 数量 */
     quantity?: number;
     /** 资源 */
@@ -122,3 +133,13 @@ export interface IUpdateItemParams {
     /** 备注 */
     note?: string;
 }
+/**
+ * 折扣
+ */
+export interface IDiscount {
+    amount?: number;
+    type?: string;
+    resource_id?: string;
+    title?: any;
+    original_amount?: number;
+}

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

@@ -1,7 +1,7 @@
 import { Account } from "../Account";
 import { ProductData } from "../Product/types";
 import { Resource } from "../Resource/types";
-import { CartItem } from "./types";
+import { CartItem, IDiscount } from "./types";
 /**
  * 生成一个唯一的 ID
  */
@@ -46,6 +46,24 @@ export declare const formatProductToCartItemOrigin: (params: {
     bundle?: any;
     options?: any;
 }) => any;
+/**
+ * 格式化折扣到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export declare const formatDiscountToCartItem: (params: {
+    cartItem: CartItem;
+    discounts: IDiscount[];
+}) => CartItem;
+/**
+ * 格式化折扣到购物车原始数据
+ * @param params 参数
+ * @returns 格式化后的购物车原始数据
+ */
+export declare const formatDiscountToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    discounts: IDiscount[];
+}) => any;
 /**
  * 格式化账户到购物车
  * @param account 账户
@@ -72,6 +90,24 @@ export declare const formatResourceToCartItemOrigin: (params: {
     cartItem: CartItem;
     resources: Resource[];
 }) => any;
+/**
+ * 格式化备注到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export declare const formatNoteToCartItem: (params: {
+    cartItem: CartItem;
+    note: string;
+}) => CartItem;
+/**
+ * 格式化备注到购物车原始数据
+ * @param params 参数
+ * @returns 格式化后的购物车原始数据
+ */
+export declare const formatNoteToCartItemOrigin: (params: {
+    cartItem: CartItem;
+    note: string;
+}) => any;
 /**
  * 格式化套餐规格信息
  * @param options 套餐规格信息

package/lib/modules/Cart/utils.js

@@ -34,6 +34,10 @@ __export(utils_exports, {
   formatAccountToCartItemOrigin: () => formatAccountToCartItemOrigin,
   formatBundle: () => formatBundle,
   formatBundleToOrigin: () => formatBundleToOrigin,
+  formatDiscountToCartItem: () => formatDiscountToCartItem,
+  formatDiscountToCartItemOrigin: () => formatDiscountToCartItemOrigin,
+  formatNoteToCartItem: () => formatNoteToCartItem,
+  formatNoteToCartItemOrigin: () => formatNoteToCartItemOrigin,
   formatOptions: () => formatOptions,
   formatOptionsToOrigin: () => formatOptionsToOrigin,
   formatProductToCartItem: () => formatProductToCartItem,
@@ -142,6 +146,23 @@ var formatProductToCartItemOrigin = (params) => {
   }
   return origin;
 };
+var formatDiscountToCartItem = (params) => {
+  const { cartItem } = params;
+  const oringin = formatDiscountToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+var formatDiscountToCartItemOrigin = (params) => {
+  const { cartItem, discounts } = params;
+  const origin = cartItem._origin;
+  if (discounts && (discounts == null ? void 0 : discounts.length)) {
+    if (!origin.product) {
+      origin.product = {};
+    }
+    origin.product.discount_list = discounts;
+  }
+  return origin;
+};
 var formatAccountToCartItem = (params) => {
   const { cartItem, account } = params;
   if (account) {
@@ -205,6 +226,22 @@ var formatResourceToCartItemOrigin = (params) => {
   }
   return origin;
 };
+var formatNoteToCartItem = (params) => {
+  const { cartItem, note } = params;
+  cartItem.note = note;
+  const oringin = formatNoteToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+var formatNoteToCartItemOrigin = (params) => {
+  const { cartItem, note } = params;
+  const origin = cartItem._origin;
+  if (!origin.product) {
+    origin.product = {};
+  }
+  origin.product.note = note;
+  return origin;
+};
 var formatOptions = (options) => {
   if (!(options == null ? void 0 : options.length))
     return [];
@@ -307,6 +344,10 @@ var getProductOriginTotalPrice = (params) => {
   formatAccountToCartItemOrigin,
   formatBundle,
   formatBundleToOrigin,
+  formatDiscountToCartItem,
+  formatDiscountToCartItemOrigin,
+  formatNoteToCartItem,
+  formatNoteToCartItemOrigin,
   formatOptions,
   formatOptionsToOrigin,
   formatProductToCartItem,

package/lib/modules/Date/index.js

@@ -45,6 +45,9 @@ var DateModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
+    if (!this.request) {
+      throw new Error("DateModule 需要 request 插件支持");
+    }
   }
   setDateRange(dateRange) {
     this.store.dateRange = dateRange;

package/lib/modules/Rules/index.js

@@ -184,10 +184,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const discountDetail = {
         amount: product.price,
         type: selectedDiscount.tag,
-        resource_id: selectedDiscount.id,
-        title: selectedDiscount.format_title,
-        original_amount: product.origin_total,
-        product_id: selectedDiscount.product_id
+        discount: {
+          resource_id: selectedDiscount.id,
+          title: selectedDiscount.format_title,
+          original_amount: product.origin_total,
+          product_id: selectedDiscount.product_id
+        }
       };
       appliedProducts.push(discountDetail);
       appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);

package/lib/modules/Summary/index.js

@@ -34,6 +34,9 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.store = options.store;
     this.shopStore = this.core.getPlugin("shopStore");
+    if (!this.shopStore) {
+      throw new Error("SummaryModule 需要 shopStore 插件支持");
+    }
   }
   async getSummary(cartItems) {
     var _a, _b;

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

@@ -25,7 +25,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     back(): void;
     gotoStep(index: number): void;
     getStepList(): IStep[];
-    getStoreCart(key?: string): Promise<any>;
     loadProducts({ category_ids, product_ids, collection, }: {
         category_ids?: number[];
         product_ids?: number[];

package/lib/solution/BookingByStep/index.js

@@ -107,9 +107,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return this.store.step.getStepList();
   }
   // 获取购物车里 temp.xxx的方法
-  async getStoreCart(key) {
-    return this.store.cart.getTemp(key);
-  }
+  // async getStoreCart(key?: string) {
+  //   return this.store.cart.getTemp(key);
+  // }
   // 加载商品，然后导到商品列表里去
   async loadProducts({
     category_ids = [],
@@ -393,18 +393,24 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources_code,
     timeSlots
   }) {
-    var _a;
+    var _a, _b, _c;
     const dateRange = this.store.date.getDateRange();
     const cartItems = this.store.cart.getItems();
-    const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id);
+    const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
+    if (!accountCartItems.length) {
+      return {
+        selectedResource: null
+      };
+    }
     let duration = accountCartItems.reduce((acc, n) => {
-      return acc + n._productOrigin.duration.value;
+      var _a2, _b2;
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
     }, 0);
-    let durationType = ((_a = accountCartItems == null ? void 0 : accountCartItems[0]) == null ? void 0 : _a._productOrigin.duration.type) || "minutes";
+    let durationType = ((_c = (_b = (_a = accountCartItems[0]) == null ? void 0 : _a._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.type) ?? "minutes";
     const resources = [];
     accountCartItems.forEach((item) => {
-      var _a2, _b;
-      (_b = (_a2 = item._productOrigin.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b.forEach((n) => {
+      var _a2, _b2, _c2;
+      (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
@@ -475,7 +481,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             console.log(this.store.cart.getItems());
             this.store.cart.updateItem({
               _id: item._id,
-              resources: [...item._origin.resources || [], res.selectedResource]
+              // 这里要做去重，避免出现同样类型的资源被塞进同一个商品
+              resources: [
+                ...(item._origin.resources || []).filter(
+                  (existingRes) => existingRes.resourceType !== res.selectedResource.resourceType
+                ),
+                res.selectedResource
+              ]
             });
             console.log(this.store.cart.getItems());
           } else {
@@ -493,7 +505,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           if (targetRenderList && targetRenderList.length > 0) {
             this.store.cart.updateItem({
               _id: item._id,
-              resources: [...item._origin.resources || [], targetRenderList[0]]
+              resources: [
+                ...(item._origin.resources || []).filter(
+                  (existingRes) => existingRes.resourceType !== targetRenderList[0].resourceType
+                ),
+                targetRenderList[0]
+              ]
             });
           } else {
             errorList.push(item._id);
@@ -510,13 +527,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems();
     const resourceIds = [];
     cartItems.forEach((item) => {
-      var _a, _b, _c;
-      (_b = (_a = item._productOrigin.product_resource) == null ? void 0 : _a.resources) == null ? void 0 : _b.forEach((n) => {
+      var _a, _b, _c, _d;
+      (_c = (_b = (_a = item._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) == null ? void 0 : _c.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
         }
       });
-      (_c = item._origin.resources) == null ? void 0 : _c.forEach((n) => {
+      (_d = item._origin.resources) == null ? void 0 : _d.forEach((n) => {
         resourceIds.push(n.relation_id);
       });
     });
@@ -526,7 +543,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       let accountDuration = 0;
       const cartItems2 = this.store.cart.getCartByAccount(account.getId());
       cartItems2.forEach((item) => {
-        accountDuration += item._productOrigin.duration.value;
+        var _a, _b;
+        accountDuration += ((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0;
       });
       if (accountDuration > duration) {
         duration = accountDuration;
@@ -572,8 +590,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     cartItems.forEach((item) => {
       const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
       newResources.forEach((n) => {
+        var _a, _b, _c, _d;
         n.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
-        n.endTime = (0, import_dayjs.default)(n.startTime).add(item._productOrigin.duration.value, item._productOrigin.duration.type).format("YYYY-MM-DD HH:mm");
+        n.endTime = (0, import_dayjs.default)(n.startTime).add(((_b = (_a = item._productOrigin) == null ? void 0 : _a.duration) == null ? void 0 : _b.value) ?? 0, ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes").format("YYYY-MM-DD HH:mm");
         delete n.times;
       });
       this.store.cart.updateItem({

package/lib/solution/BookingByStep/utils/resources.js

@@ -149,7 +149,10 @@ var getResourcesByProduct = (resourcesMap, cartItem, cartList) => {
       }, []);
       item.renderList = optional_resource.concat(default_resource);
       item.renderList = item.renderList.filter((d) => {
-        return (0, import_dayjs.default)(d.times[0].end_at).isAfter((0, import_dayjs.default)());
+        const latestTime = d.times.reduce((latest, current) => {
+          return (0, import_dayjs.default)(current.end_at).isAfter((0, import_dayjs.default)(latest.end_at)) ? current : latest;
+        }, d.times[0]);
+        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)());
       });
       item.form_id = form_id;
       acc.push(item);

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",