@pisell/pisellos 2.0.16 → 2.0.18

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

@@ -44,6 +44,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     product: Product;
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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/dist/modules/Rules/index.d.ts

@@ -25,7 +25,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
     }, options?: {
         isSelected?: boolean;
-        discountId: number;
+        discountId?: number;
+        scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;
     clear(): Promise<void>;

package/dist/modules/Rules/index.js

@@ -111,6 +111,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)
+      }, {
+        scan: true
       });
 
       // 检查是否有产品使用了新折扣
@@ -214,7 +216,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id;
+            return discount.id && discount.type === 'good_pass';
           }));
 
           // 判断优惠券是否适用于该商品
@@ -244,7 +246,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id;
+          return discount.id && discount.type === 'good_pass';
         })) {
           processedProductsMap.set(product._id, originProduct);
           return;
@@ -308,7 +310,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
           return;
         }
 
@@ -366,7 +368,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var product = _this3.hooks.getProduct(originProduct);
         var getDefaultProduct = function getDefaultProduct() {
           if (product.isClient) {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               price: product.price,
               origin_total: getProductOriginTotalPrice({
@@ -385,7 +387,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               })
             });
           } else {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               total: product.total,
               origin_total: product.origin_total,

package/dist/solution/ShopDiscount/index.js

@@ -434,7 +434,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList.forEach(function (item) {
         if (item.booking_id) {
           (item.discount_list || []).forEach(function (discount) {
-            if (discount.id) {
+            if (discount.id && discount.type === 'good_pass') {
               var _discount$discount, _discount$discount2, _discount$discount3;
               editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
                 isEditMode: true,

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

@@ -44,6 +44,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     product: Product;
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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/lib/modules/Rules/index.d.ts

@@ -25,7 +25,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
     }, options?: {
         isSelected?: boolean;
-        discountId: number;
+        discountId?: number;
+        scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;
     clear(): Promise<void>;

package/lib/modules/Rules/index.js

@@ -65,6 +65,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList]
+    }, {
+      scan: true
     });
     let hasApplicableDiscount = false;
     const newDiscountIds = newDiscountList.map((discount) => discount.id);
@@ -134,7 +136,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
-        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id)));
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && discount2.type === "good_pass")));
         if (isAvailableProduct && isLimitedProduct) {
           (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
@@ -154,7 +156,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       var _a, _b, _c;
       const product = this.hooks.getProduct(originProduct);
-      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id && discount.type === "good_pass"))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }
@@ -213,7 +215,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return;
       }
-      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan)) {
         return;
       }
       usedDiscounts.set(selectedDiscount.id, true);
@@ -268,7 +270,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const product = this.hooks.getProduct(originProduct);
       const getDefaultProduct = () => {
         if (product.isClient) {
-          this.hooks.setProduct(originProduct, {
+          return this.hooks.setProduct(originProduct, {
             discount_list: [],
             price: product.price,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
@@ -287,7 +289,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             })
           });
         } else {
-          this.hooks.setProduct(originProduct, {
+          return this.hooks.setProduct(originProduct, {
             discount_list: [],
             total: product.total,
             origin_total: product.origin_total,

package/lib/solution/ShopDiscount/index.js

@@ -271,7 +271,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (item.booking_id) {
         (item.discount_list || []).forEach((discount) => {
           var _a2, _b, _c;
-          if (discount.id) {
+          if (discount.id && discount.type === "good_pass") {
             editModeDiscountList.push({
               ...discount,
               isEditMode: true,

package/package.json

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