@pisell/pisellos 0.0.40 → 0.0.42

package/dist/modules/Cart/index.js

@@ -21,9 +21,9 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 { cloneDeep } from "lodash-es";
 import { BaseModule } from "../BaseModule";
 import { createCartItemOrigin, deleteResourceFromCartItem, deleteTimeFromCartItem, formatAccountToCartItem, formatDiscountToCartItem, formatNoteToCartItem, formatProductToCartItem, formatResourceToCartItem, getUniqueId } from "./utils";
-import { cloneDeep } from "lodash-es";
 export * from "./types";
 
 /**

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

@@ -84,6 +84,18 @@ export interface CartItem {
     resource_id?: string | number;
     /** 资源名称 */
     relation_form_name?: string;
+    /** 定金 */
+    deposit?: {
+        /** 定金总价 */
+        total: number | string;
+        /** 定金协议 */
+        protocols: {
+            /** 定金协议ID */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }[];
+    } | null;
     /** 原始数据 */
     _origin: any;
     /** 商品原始数据 */

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

@@ -2,6 +2,7 @@ import { Account } from "../Account";
 import { ProductData } from "../Product/types";
 import { Resource } from "../Resource/types";
 import { CartItem, IDiscount } from "./types";
+import Decimal from "decimal.js";
 /**
  * 生成一个唯一的 ID
  */
@@ -141,6 +142,7 @@ export declare const formatBundleToOrigin: (bundle: any) => any;
 export declare const isNormalProduct: (product: any) => boolean;
 /**
  * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品总价
  */
@@ -148,9 +150,11 @@ export declare const getProductTotalPrice: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    num?: number;
 }) => number;
 /**
  * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品原始总价
  */
@@ -158,4 +162,43 @@ export declare const getProductOriginTotalPrice: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    num?: number;
 }) => number | undefined;
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const getProductDeposit: (params: {
+    cartItem: CartItem;
+    product: ProductData;
+    bundle?: any;
+    options?: any;
+    num?: number;
+}) => {
+    total: number;
+    protocols: {
+        id: number;
+        title: string;
+    }[];
+} | null;
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const handleProductDeposit: (params: {
+    depositData: {
+        deposit_fixed?: string;
+        deposit_percentage?: string;
+    };
+    total: string | number;
+    num: number;
+}) => {
+    depositTotal: Decimal;
+    result: boolean;
+};

package/dist/modules/Cart/utils.js

@@ -1,10 +1,18 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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 dayjs from "dayjs";
+import Decimal from "decimal.js";
+
 /**
  * 生成一个唯一的 ID
  */
@@ -68,25 +76,29 @@ export var createCartItemOrigin = function createCartItemOrigin() {
  * @returns 格式化后的商品
  */
 export var formatProductToCartItem = function formatProductToCartItem(params) {
+  var _product$custom_depos;
   var cartItem = params.cartItem,
     product = params.product,
     bundle = params.bundle,
     options = params.options;
+  var num = 1; // 当前按照单个商品加入购物车
   if (product) {
     cartItem.id = product === null || product === void 0 ? void 0 : product.id;
     cartItem.name = product === null || product === void 0 ? void 0 : product.title;
     cartItem.price = product === null || product === void 0 ? void 0 : product.price;
+    cartItem.num = num;
     cartItem.total = getProductTotalPrice({
       product: product,
       bundle: bundle,
-      options: options
+      options: options,
+      num: num
     });
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
       bundle: bundle,
-      options: options
+      options: options,
+      num: num
     });
-    cartItem.num = 1;
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product === null || product === void 0 ? void 0 : product.duration;
@@ -99,6 +111,17 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   if (options !== null && options !== void 0 && options.length) {
     cartItem.options = formatOptions(options);
   }
+
+  // 如果商品有定金规则，则计算定金
+  if ((product === null || product === void 0 || (_product$custom_depos = product.custom_deposit_data) === null || _product$custom_depos === void 0 ? void 0 : _product$custom_depos.has_deposit) == 1) {
+    cartItem.deposit = getProductDeposit({
+      cartItem: cartItem,
+      product: product,
+      bundle: bundle,
+      options: options,
+      num: num
+    });
+  }
   var oringin = formatProductToCartItemOrigin(params);
   cartItem._origin = oringin;
   return cartItem;
@@ -429,6 +452,7 @@ export var isNormalProduct = function isNormalProduct(product) {
 
 /**
  * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品总价
  */
@@ -436,6 +460,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
     options = params.options;
+  var num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     price = bundle.reduce(function (accumulator, currentValue) {
@@ -449,11 +474,12 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
 };
 
 /**
  * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品原始总价
  */
@@ -461,6 +487,7 @@ export var getProductOriginTotalPrice = function getProductOriginTotalPrice(para
   var product = params.product,
     bundle = params.bundle,
     options = params.options;
+  var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
   var price = Number(product.original_price);
   if (isNaN(price) || price === 0) {
     return undefined;
@@ -477,5 +504,96 @@ export var getProductOriginTotalPrice = function getProductOriginTotalPrice(para
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
+};
+
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export var getProductDeposit = function getProductDeposit(params) {
+  var _product$custom_depos2;
+  var cartItem = params.cartItem,
+    product = params.product,
+    bundle = params.bundle,
+    options = params.options;
+  var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
+
+  // 判定商品是否有定金规则
+  if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
+    var protocols = [];
+    var total = new Decimal(0);
+    var _ref = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref.deposit_fixed,
+      deposit_percentage = _ref.deposit_percentage,
+      deposit_policy_data = _ref.deposit_policy_data;
+    // 协议数据
+    protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+    // 判断主商品是否有定金规则
+    if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+      var _handleProductDeposit = handleProductDeposit({
+          depositData: product === null || product === void 0 ? void 0 : product.custom_deposit_data,
+          total: cartItem.total || 0,
+          num: num
+        }),
+        depositTotal = _handleProductDeposit.depositTotal,
+        result = _handleProductDeposit.result;
+      if (result) {
+        total = depositTotal;
+      }
+    } else {
+      if (bundle !== null && bundle !== void 0 && bundle.length) {
+        total = bundle.reduce(function (accumulator, currentBundleProduct) {
+          var _handleProductDeposit2 = handleProductDeposit({
+              depositData: currentBundleProduct === null || currentBundleProduct === void 0 ? void 0 : currentBundleProduct.custom_deposit_data,
+              total: currentBundleProduct.price,
+              num: currentBundleProduct.num
+            }),
+            depositTotal = _handleProductDeposit2.depositTotal,
+            result = _handleProductDeposit2.result;
+          if (result) {
+            return accumulator.plus(depositTotal);
+          }
+          return accumulator;
+        }, new Decimal(0));
+      }
+    }
+    return {
+      total: total.toNumber(),
+      protocols: protocols
+    };
+  }
+  return null;
+};
+
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export var handleProductDeposit = function handleProductDeposit(params) {
+  var depositData = params.depositData,
+    total = params.total,
+    num = params.num;
+  var deposit_fixed = depositData.deposit_fixed,
+    deposit_percentage = depositData.deposit_percentage;
+  if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+    var depositFixed = Decimal(deposit_fixed || 0);
+    var depositPercent = Decimal(deposit_percentage || 0);
+    var productTotalPrice = Decimal(total || 0);
+    var deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+    return {
+      depositTotal: deposit.times(num),
+      result: true
+    };
+  }
+  return {
+    result: false,
+    depositTotal: new Decimal(0)
+  };
 };

package/dist/modules/Product/types.d.ts

@@ -156,6 +156,22 @@ export interface ProductData {
     capacity?: any;
     /** 商品套餐 */
     product_bundle?: any;
+    /** 商品定金信息 */
+    custom_deposit_data?: {
+        /** 商品是否包含定金 1:是 0:否 */
+        has_deposit: 0 | 1;
+        /** 定金固定金额 */
+        deposit_fixed?: string;
+        /** 定金百分比 */
+        deposit_percentage?: string;
+        /** 定金协议数据 */
+        deposit_policy_data?: Array<{
+            /** 定金协议id */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }>;
+    };
 }
 /**
  * 商品媒体信息接口

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

@@ -7,11 +7,18 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     protected defaultVersion: string;
     private shopStore;
     private store;
+    private request;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    /**
+     * 获取协议
+     * @param protocolId 协议ID
+     * @returns 协议
+     */
+    getProtocol(protocolId: string): Promise<any>;
     storeChange(): void;
 }

package/dist/modules/Summary/index.js

@@ -28,6 +28,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", "1.0.0");
     _defineProperty(_assertThisInitialized(_this), "shopStore", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "request", void 0);
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
@@ -44,6 +45,7 @@ export var SummaryModule = /*#__PURE__*/function (_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;
               }
@@ -55,11 +57,11 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
               if (this.shopStore) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error("SummaryModule 需要 shopStore 插件支持");
-            case 8:
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -94,6 +96,30 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return getSummary;
     }()
+    /**
+     * 获取协议
+     * @param protocolId 协议ID
+     * @returns 协议
+     */
+  }, {
+    key: "getProtocol",
+    value: (function () {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(protocolId) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              return _context3.abrupt("return", this.request.get("/shop-policy/".concat(protocolId)));
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function getProtocol(_x4) {
+        return _getProtocol.apply(this, arguments);
+      }
+      return getProtocol;
+    }())
   }, {
     key: "storeChange",
     value: function storeChange() {
@@ -102,7 +128,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
           cacheId: this.cacheId,
           fatherModule: this.fatherModule,
           store: this.store,
-          cacheKey: ['summary']
+          cacheKey: ["summary"]
         });
       }
     }

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

@@ -1,13 +1,34 @@
 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"]>;
 }

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

@@ -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/dist/modules/Summary/utils.js

@@ -5,12 +5,16 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
 
   // 计算总价
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
+
+  // 计算定金
+  var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
-    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax
+    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
+    deposit: deposit
   };
 };
 
@@ -52,4 +56,42 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     return sum.plus(productTaxRate);
   }, new Decimal(0));
   return totalTaxFee;
+};
+
+/**
+ * @title: 计算定金
+ * @param items - 购物车商品数组
+ * @returns 定金字符串，保留2位小数
+ */
+export var calculateDeposit = function calculateDeposit(items) {
+  if (!(items !== null && items !== void 0 && items.length)) {
+    return undefined;
+  }
+  var protocols = [];
+  var hasDeposit = false;
+  var total = items.reduce(function (sum, item) {
+    if (item !== null && item !== void 0 && item.deposit) {
+      var _item$deposit, _item$deposit2;
+      hasDeposit = true;
+      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+      // 将协议数据去重合并
+      item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
+        if (protocols.findIndex(function (p) {
+          return p.id === protocol.id;
+        }) === -1) {
+          protocols.push(protocol);
+        }
+      });
+      return sum.plus(cartItemTotalPrice);
+    }
+    return sum;
+  }, new Decimal(0));
+  if (hasDeposit) {
+    return {
+      total: total.toFixed(2),
+      protocols: protocols,
+      hasDeposit: hasDeposit
+    };
+  }
+  return undefined;
 };

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

@@ -65,6 +65,10 @@ 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;
     }>;
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;

package/lib/modules/Cart/index.js

@@ -23,9 +23,9 @@ __export(Cart_exports, {
   CartModule: () => CartModule
 });
 module.exports = __toCommonJS(Cart_exports);
+var import_lodash_es = require("lodash-es");
 var import_BaseModule = require("../BaseModule");
 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) {
@@ -172,9 +172,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID获取购物车
    */
   getCartByAccount(account_id) {
-    return this.store.list.filter(
-      (item) => item.holder_id === account_id
-    );
+    return this.store.list.filter((item) => item.holder_id === account_id);
   }
   /**
    * 移除购物车商品
@@ -188,9 +186,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
    * 根据账户ID清除购物车
    */
   clearCartByAccount(account_id) {
-    const items = 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 || []];
   }
   /**
@@ -216,9 +212,7 @@ var CartModule = class extends import_BaseModule.BaseModule {
   storeChange() {
     if (this.openCache) {
       const store = (0, import_lodash_es.cloneDeep)(this.store);
-      store.list = store.list.filter(
-        (item, index, self) => index === self.findIndex((t) => t._id === item._id)
-      );
+      store.list = store.list.filter((item, index, self) => index === self.findIndex((t) => t._id === item._id));
       this.checkSaveCache({
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,

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

@@ -84,6 +84,18 @@ export interface CartItem {
     resource_id?: string | number;
     /** 资源名称 */
     relation_form_name?: string;
+    /** 定金 */
+    deposit?: {
+        /** 定金总价 */
+        total: number | string;
+        /** 定金协议 */
+        protocols: {
+            /** 定金协议ID */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }[];
+    } | null;
     /** 原始数据 */
     _origin: any;
     /** 商品原始数据 */

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

@@ -2,6 +2,7 @@ import { Account } from "../Account";
 import { ProductData } from "../Product/types";
 import { Resource } from "../Resource/types";
 import { CartItem, IDiscount } from "./types";
+import Decimal from "decimal.js";
 /**
  * 生成一个唯一的 ID
  */
@@ -141,6 +142,7 @@ export declare const formatBundleToOrigin: (bundle: any) => any;
 export declare const isNormalProduct: (product: any) => boolean;
 /**
  * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品总价
  */
@@ -148,9 +150,11 @@ export declare const getProductTotalPrice: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    num?: number;
 }) => number;
 /**
  * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
  * @param item 商品
  * @returns 商品原始总价
  */
@@ -158,4 +162,43 @@ export declare const getProductOriginTotalPrice: (params: {
     product: ProductData;
     bundle?: any;
     options?: any;
+    num?: number;
 }) => number | undefined;
+/**
+ * 获取商品定金
+ * @description 定金基于商品售价来算，最终乘商品数量
+ * 1、如果套餐主商品有定金规则，则定金为：（套餐商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * 2、如果套餐主商品没有定金规则，子商品有定金规则，则定金为：（套餐子商品售价 * 套餐子商品定金百分比 + 套餐子商品定金固定金额）* 商品数量，最终将所有子商品定金相加
+ * 3、普通商品/单规格商品/组合规则商品，定金规则：（商品总售价 * 定金百分比 + 定金固定金额）* 商品数量
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const getProductDeposit: (params: {
+    cartItem: CartItem;
+    product: ProductData;
+    bundle?: any;
+    options?: any;
+    num?: number;
+}) => {
+    total: number;
+    protocols: {
+        id: number;
+        title: string;
+    }[];
+} | null;
+/**
+ * 计算商品定金
+ * @param params 参数
+ * @returns 商品定金
+ */
+export declare const handleProductDeposit: (params: {
+    depositData: {
+        deposit_fixed?: string;
+        deposit_percentage?: string;
+    };
+    total: string | number;
+    num: number;
+}) => {
+    depositTotal: Decimal;
+    result: boolean;
+};

package/lib/modules/Cart/utils.js

@@ -46,13 +46,16 @@ __export(utils_exports, {
   formatProductToCartItemOrigin: () => formatProductToCartItemOrigin,
   formatResourceToCartItem: () => formatResourceToCartItem,
   formatResourceToCartItemOrigin: () => formatResourceToCartItemOrigin,
+  getProductDeposit: () => getProductDeposit,
   getProductOriginTotalPrice: () => getProductOriginTotalPrice,
   getProductTotalPrice: () => getProductTotalPrice,
   getUniqueId: () => getUniqueId,
+  handleProductDeposit: () => handleProductDeposit,
   isNormalProduct: () => isNormalProduct
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_decimal = __toESM(require("decimal.js"));
 var getUniqueId = (prefix = "", maxLength = 11) => {
   return prefix + (Math.random() + "").replace(/\D/g, "").substring(0, maxLength);
 };
@@ -100,14 +103,16 @@ var createCartItemOrigin = () => {
   };
 };
 var formatProductToCartItem = (params) => {
+  var _a;
   const { cartItem, product, bundle, options } = params;
+  const num = 1;
   if (product) {
     cartItem.id = product == null ? void 0 : product.id;
     cartItem.name = product == null ? void 0 : product.title;
     cartItem.price = product == null ? void 0 : product.price;
-    cartItem.total = getProductTotalPrice({ product, bundle, options });
-    cartItem.origin_total = getProductOriginTotalPrice({ product, bundle, options });
-    cartItem.num = 1;
+    cartItem.num = num;
+    cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.origin_total = getProductOriginTotalPrice({ product, bundle, options, num });
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product == null ? void 0 : product.duration;
@@ -120,6 +125,9 @@ var formatProductToCartItem = (params) => {
   if (options == null ? void 0 : options.length) {
     cartItem.options = formatOptions(options);
   }
+  if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
+    cartItem.deposit = getProductDeposit({ cartItem, product, bundle, options, num });
+  }
   const oringin = formatProductToCartItemOrigin(params);
   cartItem._origin = oringin;
   return cartItem;
@@ -365,6 +373,7 @@ var isNormalProduct = (product) => {
 };
 var getProductTotalPrice = (params) => {
   const { product, bundle, options } = params;
+  const num = params.num || 1;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -376,10 +385,11 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
   let price = Number(product.original_price);
   if (isNaN(price) || price === 0) {
     return void 0;
@@ -394,7 +404,56 @@ var getProductOriginTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return price * num;
+};
+var getProductDeposit = (params) => {
+  var _a;
+  const { cartItem, product, bundle, options } = params;
+  const num = (params == null ? void 0 : params.num) || 1;
+  if (((_a = product == null ? void 0 : product.custom_deposit_data) == null ? void 0 : _a.has_deposit) == 1) {
+    const protocols = [];
+    let total = new import_decimal.default(0);
+    const { deposit_fixed, deposit_percentage, deposit_policy_data } = (product == null ? void 0 : product.custom_deposit_data) || {};
+    protocols.push(...deposit_policy_data || []);
+    if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+      const { depositTotal, result } = handleProductDeposit({
+        depositData: product == null ? void 0 : product.custom_deposit_data,
+        total: cartItem.total || 0,
+        num
+      });
+      if (result) {
+        total = depositTotal;
+      }
+    } else {
+      if (bundle == null ? void 0 : bundle.length) {
+        total = bundle.reduce((accumulator, currentBundleProduct) => {
+          const { depositTotal, result } = handleProductDeposit({
+            depositData: currentBundleProduct == null ? void 0 : currentBundleProduct.custom_deposit_data,
+            total: currentBundleProduct.price,
+            num: currentBundleProduct.num
+          });
+          if (result) {
+            return accumulator.plus(depositTotal);
+          }
+          return accumulator;
+        }, new import_decimal.default(0));
+      }
+    }
+    return { total: total.toNumber(), protocols };
+  }
+  return null;
+};
+var handleProductDeposit = (params) => {
+  const { depositData, total, num } = params;
+  const { deposit_fixed, deposit_percentage } = depositData;
+  if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
+    const depositFixed = (0, import_decimal.default)(deposit_fixed || 0);
+    const depositPercent = (0, import_decimal.default)(deposit_percentage || 0);
+    const productTotalPrice = (0, import_decimal.default)(total || 0);
+    const deposit = depositFixed.plus(depositPercent.times(productTotalPrice));
+    return { depositTotal: deposit.times(num), result: true };
+  }
+  return { result: false, depositTotal: new import_decimal.default(0) };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -415,8 +474,10 @@ var getProductOriginTotalPrice = (params) => {
   formatProductToCartItemOrigin,
   formatResourceToCartItem,
   formatResourceToCartItemOrigin,
+  getProductDeposit,
   getProductOriginTotalPrice,
   getProductTotalPrice,
   getUniqueId,
+  handleProductDeposit,
   isNormalProduct
 });

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

@@ -156,6 +156,22 @@ export interface ProductData {
     capacity?: any;
     /** 商品套餐 */
     product_bundle?: any;
+    /** 商品定金信息 */
+    custom_deposit_data?: {
+        /** 商品是否包含定金 1:是 0:否 */
+        has_deposit: 0 | 1;
+        /** 定金固定金额 */
+        deposit_fixed?: string;
+        /** 定金百分比 */
+        deposit_percentage?: string;
+        /** 定金协议数据 */
+        deposit_policy_data?: Array<{
+            /** 定金协议id */
+            id: number;
+            /** 定金协议标题 */
+            title: string;
+        }>;
+    };
 }
 /**
  * 商品媒体信息接口

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

@@ -7,11 +7,18 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     protected defaultVersion: string;
     private shopStore;
     private store;
+    private request;
     private cacheId;
     private openCache;
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState["summary"]>;
+    /**
+     * 获取协议
+     * @param protocolId 协议ID
+     * @returns 协议
+     */
+    getProtocol(protocolId: string): Promise<any>;
     storeChange(): void;
 }

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";
 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"]>;
 }

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

@@ -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/solution/BookingByStep/index.d.ts

@@ -65,6 +65,10 @@ 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;
     }>;
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;

package/package.json

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