@pisell/pisellos 2.0.16 → 2.0.17

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

@@ -216,11 +216,6 @@ export declare const getProductDeposit: (params: {
     total: number;
     protocols: {
         id: number;
-        /**
-         * 格式化折扣到购物车
-         * @param params 参数
-         * @returns 格式化后的购物车
-         */
         title: string;
     }[];
 } | null;

package/dist/modules/Cart/utils.js

@@ -542,16 +542,18 @@ export var getProductDeposit = function getProductDeposit(params) {
 
   // 判定商品是否有定金规则
   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 _ref2 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
       deposit_fixed = _ref2.deposit_fixed,
       deposit_percentage = _ref2.deposit_percentage,
-      deposit_policy_data = _ref2.deposit_policy_data;
-    // 协议数据
-    protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+      deposit_policy_data = _ref2.deposit_policy_data,
+      self_deposit_policy_ids = _ref2.self_deposit_policy_ids;
+    // 所有协议数据
+    var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
     var productHasDeposit = false;
+    // 关联的定金协议id
+    var protocolIds = [];
 
     // 判断主商品是否有定金规则
     if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
@@ -564,19 +566,22 @@ export var getProductDeposit = function getProductDeposit(params) {
         result = _handleProductDeposit.result;
       if (result) {
         total = depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(self_deposit_policy_ids || []));
         productHasDeposit = true;
       }
     } else {
       if (bundle !== null && bundle !== void 0 && bundle.length) {
-        total = bundle.reduce(function (accumulator, currentBundleProduct) {
+        total = bundle.reduce(function (accumulator, currBundleProduct) {
+          var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
           var _handleProductDeposit2 = handleProductDeposit({
-              depositData: currentBundleProduct === null || currentBundleProduct === void 0 ? void 0 : currentBundleProduct.custom_deposit_data,
-              total: currentBundleProduct.price,
-              num: currentBundleProduct.num
+              depositData: depositData,
+              total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
+              num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
             }),
             depositTotal = _handleProductDeposit2.depositTotal,
             result = _handleProductDeposit2.result;
           if (result) {
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
             productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
@@ -585,6 +590,10 @@ export var getProductDeposit = function getProductDeposit(params) {
       }
     }
     if (productHasDeposit) {
+      var ids = new Set(protocolIds);
+      var protocols = allProtocols.filter(function (item) {
+        return ids.has(item.id);
+      });
       return {
         total: total.toNumber(),
         protocols: protocols

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

@@ -168,6 +168,8 @@ export interface ProductData {
         deposit_fixed?: string;
         /** 定金百分比 */
         deposit_percentage?: string;
+        /** 关联的定金协议id */
+        self_deposit_policy_ids?: number[];
         /** 定金协议数据 */
         deposit_policy_data?: Array<{
             /** 定金协议id */

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

@@ -216,11 +216,6 @@ export declare const getProductDeposit: (params: {
     total: number;
     protocols: {
         id: number;
-        /**
-         * 格式化折扣到购物车
-         * @param params 参数
-         * @returns 格式化后的购物车
-         */
         title: string;
     }[];
 } | null;

package/lib/modules/Cart/utils.js

@@ -441,11 +441,16 @@ var getProductDeposit = (params) => {
   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 || []);
+    const {
+      deposit_fixed,
+      deposit_percentage,
+      deposit_policy_data,
+      self_deposit_policy_ids
+    } = (product == null ? void 0 : product.custom_deposit_data) || {};
+    const allProtocols = deposit_policy_data || [];
     let productHasDeposit = false;
+    const protocolIds = [];
     if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
       const { depositTotal, result } = handleProductDeposit({
         depositData: product == null ? void 0 : product.custom_deposit_data,
@@ -454,17 +459,20 @@ var getProductDeposit = (params) => {
       });
       if (result) {
         total = depositTotal;
+        protocolIds.push(...self_deposit_policy_ids || []);
         productHasDeposit = true;
       }
     } else {
       if (bundle == null ? void 0 : bundle.length) {
-        total = bundle.reduce((accumulator, currentBundleProduct) => {
+        total = bundle.reduce((accumulator, currBundleProduct) => {
+          const depositData = currBundleProduct == null ? void 0 : currBundleProduct.custom_deposit_data;
           const { depositTotal, result } = handleProductDeposit({
-            depositData: currentBundleProduct == null ? void 0 : currentBundleProduct.custom_deposit_data,
-            total: currentBundleProduct.price,
-            num: currentBundleProduct.num
+            depositData,
+            total: currBundleProduct == null ? void 0 : currBundleProduct.price,
+            num: (currBundleProduct == null ? void 0 : currBundleProduct.num) || 1
           });
           if (result) {
+            protocolIds.push(...(depositData == null ? void 0 : depositData.self_deposit_policy_ids) || []);
             productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
@@ -473,6 +481,8 @@ var getProductDeposit = (params) => {
       }
     }
     if (productHasDeposit) {
+      const ids = new Set(protocolIds);
+      const protocols = allProtocols.filter((item) => ids.has(item.id));
       return { total: total.toNumber(), protocols };
     }
     return null;

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

@@ -168,6 +168,8 @@ export interface ProductData {
         deposit_fixed?: string;
         /** 定金百分比 */
         deposit_percentage?: string;
+        /** 关联的定金协议id */
+        self_deposit_policy_ids?: number[];
         /** 定金协议数据 */
         deposit_policy_data?: Array<{
             /** 定金协议id */

package/package.json

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