From 6639cdfb2cc7afa02e46448eeed440fe1933125a Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 6 Jun 2024 17:48:41 +0800
Subject: [PATCH] 阶梯促销使用优惠券的bug优化

---
 packageE/pages/cart/cart2/cart2.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 65f05a7..a9b6445 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -3252,15 +3252,25 @@ Page({
         //-- 如果是零售价的时候 ---
         if(th.data.using_quan[pickid].FactPriceType){
            let scj_arr=c_arr[i].scj_arr;
-           let scj_check_quan_price_list='';
-           let scj_check_quan_ware_list='';
+           let scj_check_quan_price_list=[];
+           let scj_check_quan_ware_list=[];
            for (let jh = 0; jh <scj_arr.length ; jh++) {
-             scj_check_quan_price_list+=(scj_arr[jh].sum_price+",")
-             scj_check_quan_ware_list+=(scj_arr[jh].erpwareid+",")
+
+             //如果商品有重复的过滤，一般是组合购和阶梯购的情况下
+             var idxx = scj_check_quan_ware_list.findIndex(function (ele) {
+               return ele == encodeURIComponent(scj_arr[jh].erpwareid);
+             })
+
+             if (idxx > -1) {
+               scj_check_quan_price_list[idxx] += scj_arr[jh].sum_price;
+             } else {
+               scj_check_quan_price_list.push(scj_arr[jh].sum_price);
+               scj_check_quan_ware_list.push(encodeURIComponent(scj_arr[jh].erpwareid));
+             }
            }
 
-           get_c_price_data.WaresSum= ut.sub_last(scj_check_quan_price_list);
-           get_c_price_data.WareIds= ut.sub_last(scj_check_quan_ware_list);
+           get_c_price_data.WaresSum= scj_check_quan_price_list.join();
+           get_c_price_data.WareIds= scj_check_quan_ware_list.join();
            is_quan_scj=1;
         }
 
@@ -7187,6 +7197,7 @@ Page({
       }
     }, 500);
   },
+
   //-----获取购物车进来的劵-------
   get_cart_quan: async function (order_prom_list_cart) {
     var th = this;
--
libgit2 0.21.4