@pisell/pisellos 0.0.13 → 0.0.14

package/dist/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/dist/modules/Cart/index.js

@@ -23,7 +23,8 @@ 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 { BaseModule } from "../BaseModule";
 import { CartHooks } from "./types";
-import { createCartItemOrigin, formatAccountToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { createCartItemOrigin, formatAccountToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
+import { cloneDeep } from "lodash-es";
 export * from "./types";
 
 /**
@@ -42,15 +43,6 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
-    // 导出的模块 API
-    _defineProperty(_assertThisInitialized(_this), "exports", {
-      addItem: _this.addItem.bind(_assertThisInitialized(_this)),
-      getItemCount: _this.getItemCount.bind(_assertThisInitialized(_this)),
-      getTotalPrice: _this.getTotalPrice.bind(_assertThisInitialized(_this)),
-      getItems: _this.getItems.bind(_assertThisInitialized(_this)),
-      updateItem: _this.updateItem.bind(_assertThisInitialized(_this)),
-      removeItem: _this.removeItem.bind(_assertThisInitialized(_this))
-    });
     return _this;
   }
 
@@ -111,10 +103,10 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
               account = params.account, product = params.product, bundle = params.bundle, options = params.options; // 生成一个唯一的 ID
               cartItem = {
                 _id: getUniqueId(),
-                _origin: createCartItemOrigin(),
-                _productOrigin: product
+                _origin: createCartItemOrigin()
               };
               if (product) {
+                cartItem._productOrigin = cloneDeep(product);
                 cartItem = formatProductToCartItem({
                   cartItem: cartItem,
                   product: product,
@@ -158,66 +150,37 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
     key: "updateItem",
     value: (function () {
       var _updateItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _tempCartItem$_origin;
-        var _id, cartItem, account, product, resources, note, tempCartItem, items;
+        var tempCartItem, items;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _id = params._id, cartItem = params.cartItem, account = params.account, product = params.product, resources = params.resources, note = params.note;
-              tempCartItem = this.store.list.find(function (i) {
-                return i._id === _id;
-              });
-              if (tempCartItem) {
-                _context3.next = 5;
-                break;
-              }
-              console.warn("[CartModule] 更新购物车商品失败，商品不存在");
-              return _context3.abrupt("return");
-            case 5:
-              if (cartItem) {
-                tempCartItem = cartItem;
-              }
-              if (product) {
-                tempCartItem = formatProductToCartItem({
-                  cartItem: tempCartItem,
-                  product: product
-                });
-              }
-              if (account) {
-                tempCartItem = formatAccountToCartItem({
-                  cartItem: tempCartItem,
-                  account: account
-                });
-              }
-              if (resources) {
-                tempCartItem = formatResourceToCartItem({
-                  cartItem: tempCartItem,
-                  resources: resources
-                });
-              }
-              if (note && (_tempCartItem$_origin = tempCartItem._origin) !== null && _tempCartItem$_origin !== void 0 && _tempCartItem$_origin.product) {
-                tempCartItem.note = note;
-                tempCartItem._origin.product.note = note;
-              }
-
-              // 更新购物车数据
+              _context3.prev = 0;
+              tempCartItem = this.formatCartItem(params); // 更新购物车数据
               items = this.store.list.map(function (item) {
-                var _tempCartItem;
-                if (item._id === ((_tempCartItem = tempCartItem) === null || _tempCartItem === void 0 ? void 0 : _tempCartItem._id)) {
+                if (item._id === (tempCartItem === null || tempCartItem === void 0 ? void 0 : tempCartItem._id)) {
                   return tempCartItem;
                 }
                 return item;
               });
-              this.store.list = items;
-
+              this.store.list = _toConsumableArray(items);
               // 触发事件
-              _context3.next = 14;
+              _context3.next = 6;
+              return this.core.effects.emit(CartHooks.OnCartUpdateItem, tempCartItem);
+            case 6:
+              _context3.next = 8;
               return this.core.effects.emit("".concat(this.name, ":changed"), items);
-            case 14:
+            case 8:
+              _context3.next = 13;
+              break;
+            case 10:
+              _context3.prev = 10;
+              _context3.t0 = _context3["catch"](0);
+              console.error("[CartModule] 更新购物车商品失败", _context3.t0);
+            case 13:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this);
+        }, _callee3, this, [[0, 10]]);
       }));
       function updateItem(_x4) {
         return _updateItem.apply(this, arguments);
@@ -225,9 +188,65 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
       return updateItem;
     }()
     /**
-     * 批量设置购物车数据
+     * 格式化数据到购物车
      */
     )
+  }, {
+    key: "formatCartItem",
+    value: function formatCartItem(params) {
+      var _id = params._id,
+        cartItem = params.cartItem,
+        account = params.account,
+        product = params.product,
+        discounts = params.discounts,
+        resources = params.resources,
+        note = params.note;
+      var tempCartItem = this.store.list.find(function (i) {
+        return i._id === _id;
+      });
+      if (!tempCartItem) {
+        throw new Error("[CartModule] 格式化数据到购物车失败，商品不存在");
+      }
+      if (cartItem) {
+        tempCartItem = cartItem;
+      }
+      if (product) {
+        tempCartItem._productOrigin = cloneDeep(product);
+        tempCartItem = formatProductToCartItem({
+          cartItem: tempCartItem,
+          product: product
+        });
+      }
+      if (discounts) {
+        tempCartItem = formatDiscountToCartItem({
+          cartItem: tempCartItem,
+          discounts: discounts
+        });
+      }
+      if (account) {
+        tempCartItem = formatAccountToCartItem({
+          cartItem: tempCartItem,
+          account: account
+        });
+      }
+      if (resources) {
+        tempCartItem = formatResourceToCartItem({
+          cartItem: tempCartItem,
+          resources: resources
+        });
+      }
+      if (note) {
+        tempCartItem = formatNoteToCartItem({
+          cartItem: tempCartItem,
+          note: note
+        });
+      }
+      return tempCartItem;
+    }
+
+    /**
+     * 批量设置购物车数据
+     */
   }, {
     key: "batchSetItems",
     value: (function () {
@@ -236,7 +255,10 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.store.list = items || [];
-            case 1:
+              // 触发事件
+              _context4.next = 3;
+              return this.core.effects.emit("".concat(this.name, ":changed"), items);
+            case 3:
             case "end":
               return _context4.stop();
           }
@@ -246,26 +268,23 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return _batchSetItems.apply(this, arguments);
       }
       return batchSetItems;
-    }())
-  }, {
-    key: "getItemCount",
-    value: function getItemCount() {
-      return this.store.list.length;
-    }
-  }, {
-    key: "getTotalPrice",
-    value: function getTotalPrice() {
-      // return this.store.list.reduce((total: number, item: CartItem) => total + item.price * item.quantity, 0);
-      return 0;
-    }
+    }()
+    /**
+     * 获取购物车商品
+     */
+    )
   }, {
     key: "getItems",
     value: function getItems() {
       return this.store.list;
     }
+
+    /**
+     * 移除购物车商品
+     */
   }, {
     key: "removeItem",
-    value: function () {
+    value: (function () {
       var _removeItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
         var items;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -288,40 +307,10 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
       }
       return removeItem;
     }()
-  }, {
-    key: "storeTemp",
-    value: function () {
-      var _storeTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key, value) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              this.store.temp[key] = value;
-              _context6.next = 3;
-              return this.core.effects.emit("".concat(this.name, ":changed"), this.store.temp);
-            case 3:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function storeTemp(_x7, _x8) {
-        return _storeTemp.apply(this, arguments);
-      }
-      return storeTemp;
-    }()
-  }, {
-    key: "getTemp",
-    value: function getTemp(key) {
-      if (!key) {
-        return this.store.temp;
-      }
-      return this.store.temp[key];
-    }
-  }, {
-    key: "clear",
-    value: function clear() {
-      this.store.list = [];
-    }
+    /**
+     * 根据账户ID清除购物车
+     */
+    )
   }, {
     key: "clearCartByAccount",
     value: function clearCartByAccount(account_id) {
@@ -329,6 +318,10 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return item.holder_id !== account_id;
       });
     }
+
+    /**
+     * 根据账户ID获取购物车
+     */
   }, {
     key: "getCartByAccount",
     value: function getCartByAccount(account_id) {
@@ -336,6 +329,15 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
         return item.holder_id === account_id;
       });
     }
+
+    /**
+     * 清除购物车
+     */
+  }, {
+    key: "clear",
+    value: function clear() {
+      this.store.list = [];
+    }
   }]);
   return CartModule;
 }(BaseModule);

package/dist/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/dist/modules/Cart/types.js

@@ -15,13 +15,13 @@ export var CartHooks = /*#__PURE__*/function (CartHooks) {
  */
 
 /**
- * 购物车模块 API
+ * 添加商品到购物车参数
  */
 
 /**
- * 添加商品到购物车参数
+ * 更新购物车信息参数
  */
 
 /**
- * 更新购物车信息参数
+ * 折扣
  */

package/dist/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/dist/modules/Cart/utils.js

@@ -132,6 +132,36 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
   return origin;
 };
 
+/**
+ * 格式化折扣到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export var formatDiscountToCartItem = function formatDiscountToCartItem(params) {
+  var cartItem = params.cartItem;
+  var oringin = formatDiscountToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+
+/**
+ * 格式化折扣到购物车原始数据
+ * @param params 参数
+ * @returns 格式化后的购物车原始数据
+ */
+export var formatDiscountToCartItemOrigin = function formatDiscountToCartItemOrigin(params) {
+  var cartItem = params.cartItem,
+    discounts = params.discounts;
+  var origin = cartItem._origin;
+  if (discounts && discounts !== null && discounts !== void 0 && discounts.length) {
+    if (!origin.product) {
+      origin.product = {};
+    }
+    origin.product.discount_list = discounts;
+  }
+  return origin;
+};
+
 /**
  * 格式化账户到购物车
  * @param account 账户
@@ -214,6 +244,36 @@ export var formatResourceToCartItemOrigin = function formatResourceToCartItemOri
   return origin;
 };
 
+/**
+ * 格式化备注到购物车
+ * @param params 参数
+ * @returns 格式化后的购物车
+ */
+export var formatNoteToCartItem = function formatNoteToCartItem(params) {
+  var cartItem = params.cartItem,
+    note = params.note;
+  cartItem.note = note;
+  var oringin = formatNoteToCartItemOrigin(params);
+  cartItem._origin = oringin;
+  return cartItem;
+};
+
+/**
+ * 格式化备注到购物车原始数据
+ * @param params 参数
+ * @returns 格式化后的购物车原始数据
+ */
+export var formatNoteToCartItemOrigin = function formatNoteToCartItemOrigin(params) {
+  var cartItem = params.cartItem,
+    note = params.note;
+  var origin = cartItem._origin;
+  if (!origin.product) {
+    origin.product = {};
+  }
+  origin.product.note = note;
+  return origin;
+};
+
 /**
  * 格式化套餐规格信息
  * @param options 套餐规格信息

package/dist/modules/Date/index.js

@@ -41,7 +41,12 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store;
               this.request = this.core.getPlugin("request");
-            case 3:
+              if (this.request) {
+                _context.next = 5;
+                break;
+              }
+              throw new Error("DateModule 需要 request 插件支持");
+            case 5:
             case "end":
               return _context.stop();
           }

package/dist/modules/Rules/index.js

@@ -280,10 +280,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var 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/dist/modules/Summary/index.js

@@ -40,7 +40,12 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options.store;
               this.shopStore = this.core.getPlugin("shopStore");
-            case 3:
+              if (this.shopStore) {
+                _context.next = 5;
+                break;
+              }
+              throw new Error("SummaryModule 需要 shopStore 插件支持");
+            case 5:
             case "end":
               return _context.stop();
           }

package/dist/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[];