From 4eb04adfc52cae27ff8c5c112bd1e1c3378b524d Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 29 Apr 2023 20:42:19 +0800
Subject: [PATCH] 多促销的优化

---
 packageE/pages/cart/cart2/cart2.wxml |  1 +
 utils/more_cx.js                     | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 2f2c022..95b6d99 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -98,6 +98,7 @@
               <!----商品名称规格---->
               <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
                 <view class="goods-name ellipsis-2">{{items.goods_name}}</view>
+                <view class="goods-name ellipsis-2">{{items.goods_name}}</view>
                 <!-- 商品属性 -->
                 <view class="flex-vertical fs28 color-gray n_guige">
                   <view class="goods-color">
diff --git a/utils/more_cx.js b/utils/more_cx.js
index d35b3ae..ee4ac9d 100644
--- a/utils/more_cx.js
+++ b/utils/more_cx.js
@@ -297,7 +297,7 @@ module.exports = {
         return false;
     },
     //-- 判读一下促销分组的问题 --
-    //-- is_need_ck_num 是多门店计算的时候，数量是不是要累家计算 --
+    //-- is_need_ck_num 是多门店计算的时候，数量是不是要累家计算,主要是拿来计算限购 --
     //-- need_ok是判断要不要满足条件 --
     async cart_cx_group(th,goods,car_item,is_need_ck_num,need_ok,func){
 
@@ -370,8 +370,26 @@ module.exports = {
 
             //-- 把活动进行规整 --
             var more_cx=c_item.more_cx;
+            if(!more_cx) continue;
             for (var j=0;j<more_cx.length;j++){
                 var n_item=more_cx[j];
+                //--- 当是组合购的时候，这个地方要开始计算限购 is_need_ck_num=1--
+                if(n_item.prom_type==7 && is_need_ck_num){
+                    //判断是不是限购
+                    var zh_gd_fd=n_item.gdlist.find((e1)=>{
+                       return e1.goods_id==c_item.goods_id && e1.buyqty>0
+                    })
+
+                    var  in_zhact_gdmap_new=th.data.in_zhact_gdmap_new;
+                    var key = c_item.goods_id + "." + n_item.prom_id;
+
+                    //如果是组合购
+                    if(zh_gd_fd && in_zhact_gdmap_new[key] && in_zhact_gdmap_new[key]>=zh_gd_fd.buyqty){
+                       continue;
+                    }
+                }
+
+
                 var key=n_item.prom_type+'-'+n_item.prom_id;
                 var fd=cx_act_map.find(function (e){
                     return e.key==key;
--
libgit2 0.21.4