From 78982f9692bfb1e45629bcc4ffa77700020364c6 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 28 Apr 2023 16:59:43 +0800
Subject: [PATCH] 多促销的优化

---
 pages/cart/cart/cart.js |  7 ++++---
 utils/more_cx.js        | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 68584da..1e9d6e9 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1466,7 +1466,7 @@ Page({
 
         this.doCheckAll(function (){
             e.all_check_prom_activity();
-        });
+        },1);
 
       }
     }
@@ -1875,7 +1875,7 @@ Page({
   },
 
   //----------检查是否全选---------
-  doCheckAll:async function (func) {
+  doCheckAll:async function (func,n_ok) {
     var th = this,
       tfeel = 0,
       t_num = 0,
@@ -1898,9 +1898,10 @@ Page({
         car[a].zh_map=null;
         car[a].ladder_map=null;
 
+
         var item = car[a].goods, is_s_sele = 1;
         //-- 先批量判断一下活动的类型，同时要同步跟新 --
-        await m_cx.cart_cx_group(th,item,car[a],1,0,(show_can_cx)=>{
+        await m_cx.cart_cx_group(th,item,car[a],1,n_ok,(show_can_cx)=>{
           var offline_price = 0;
           var offline_num = 0;
           for (var c = 0; c < item.length; c++) {
diff --git a/utils/more_cx.js b/utils/more_cx.js
index a567d78..d35b3ae 100644
--- a/utils/more_cx.js
+++ b/utils/more_cx.js
@@ -519,6 +519,24 @@ module.exports = {
                     })
                     //当满足组合的要求：总数要满足，起购数要满足
                     if(this.ch_zh_ok(zh_pro0,zhact_gdlist,zh_goods,th,item_act_map,is_need_ck_num,need_ok)){
+
+                        if(is_need_ck_num){
+                            //先缓存活动数量
+                            var need_ck=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0;
+                            need_ck+=item_act_map.act_num;
+                            th.data.in_zhact_new[aid]=need_ck;
+
+                            if(item_act_map.in_zhact_gdmap){
+                                var in_zhact_gdmap1 = item_act_map['in_zhact_gdmap'];
+                                for (var vg in in_zhact_gdmap1) {
+                                    if (!th.data.in_zhact_gdmap_new[vg]) th.data.in_zhact_gdmap_new[vg] = 0;
+                                    th.data.in_zhact_gdmap_new[vg] += in_zhact_gdmap1[vg];
+                                }
+                            }
+
+
+                        }
+
                         can_calc_cx.push(item_act_map)
                     }
                     break;
--
libgit2 0.21.4