@pisell/pisellos 0.0.41 → 0.0.42

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

@@ -180,7 +180,7 @@ export declare const getProductDeposit: (params: {
     options?: any;
     num?: number;
 }) => {
-    total: string;
+    total: number;
     protocols: {
         id: number;
         title: string;

package/dist/modules/Cart/utils.js

@@ -113,7 +113,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
   }
 
   // 如果商品有定金规则，则计算定金
-  if (product !== null && product !== void 0 && (_product$custom_depos = product.custom_deposit_data) !== null && _product$custom_depos !== void 0 && _product$custom_depos.has_deposit) {
+  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,
@@ -532,6 +532,7 @@ export var getProductDeposit = function getProductDeposit(params) {
       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") {
@@ -563,7 +564,7 @@ export var getProductDeposit = function getProductDeposit(params) {
       }
     }
     return {
-      total: total.toFixed(2),
+      total: total.toNumber(),
       protocols: protocols
     };
   }

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/utils.d.ts

@@ -25,4 +25,5 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Deci
 export declare const calculateDeposit: (items: CartItem[]) => {
     total: string;
     protocols: any[];
+    hasDeposit: never;
 } | undefined;

package/dist/modules/Summary/utils.js

@@ -68,13 +68,14 @@ export var calculateDeposit = function calculateDeposit(items) {
     return undefined;
   }
   var protocols = [];
+  var hasDeposit = false;
   var total = items.reduce(function (sum, item) {
-    var _item$deposit;
-    if (item !== null && item !== void 0 && (_item$deposit = item.deposit) !== null && _item$deposit !== void 0 && (_item$deposit = _item$deposit.protocols) !== null && _item$deposit !== void 0 && _item$deposit.length) {
-      var _item$deposit2, _item$deposit3;
-      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 ? void 0 : _item$deposit2.total) || 0);
+    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$deposit3 = item.deposit) === null || _item$deposit3 === void 0 || (_item$deposit3 = _item$deposit3.protocols) === null || _item$deposit3 === void 0 || _item$deposit3.forEach(function (protocol) {
+      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) {
@@ -85,8 +86,12 @@ export var calculateDeposit = function calculateDeposit(items) {
     }
     return sum;
   }, new Decimal(0));
-  return {
-    total: total.toFixed(2),
-    protocols: protocols
-  };
+  if (hasDeposit) {
+    return {
+      total: total.toFixed(2),
+      protocols: protocols,
+      hasDeposit: hasDeposit
+    };
+  }
+  return undefined;
 };

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

@@ -180,7 +180,7 @@ export declare const getProductDeposit: (params: {
     options?: any;
     num?: number;
 }) => {
-    total: string;
+    total: number;
     protocols: {
         id: number;
         title: string;

package/lib/modules/Cart/utils.js

@@ -125,7 +125,7 @@ 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) {
+  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);
@@ -439,7 +439,7 @@ var getProductDeposit = (params) => {
         }, new import_decimal.default(0));
       }
     }
-    return { total: total.toFixed(2), protocols };
+    return { total: total.toNumber(), protocols };
   }
   return null;
 };

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/utils.d.ts

@@ -25,4 +25,5 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Deci
 export declare const calculateDeposit: (items: CartItem[]) => {
     total: string;
     protocols: any[];
+    hasDeposit: never;
 } | undefined;

package/lib/modules/Summary/utils.js

@@ -78,11 +78,13 @@ var calculateDeposit = (items) => {
     return void 0;
   }
   const protocols = [];
+  let hasDeposit = false;
   const total = items.reduce((sum, item) => {
-    var _a, _b, _c, _d, _e;
-    if ((_b = (_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.protocols) == null ? void 0 : _b.length) {
-      const cartItemTotalPrice = new import_decimal.default(((_c = item == null ? void 0 : item.deposit) == null ? void 0 : _c.total) || 0);
-      (_e = (_d = item == null ? void 0 : item.deposit) == null ? void 0 : _d.protocols) == null ? void 0 : _e.forEach((protocol) => {
+    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);
         }
@@ -91,10 +93,10 @@ var calculateDeposit = (items) => {
     }
     return sum;
   }, new import_decimal.default(0));
-  return {
-    total: total.toFixed(2),
-    protocols
-  };
+  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 = {

package/package.json

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