阶梯购再来一单

abson
1 parent f5648acb
Showing 2 changed files with 46 additions and 15 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -993,7 +993,8 @@ Page({
 		  var back_goods_arr=[];
 		  var err_text="";	  
 		  for(var i in goods_list){
-			  var g_item=goods_list[i];
+				var g_item=goods_list[i];
+				var b_item={};
 			   //--如果是赠品，不加入购物车--
 			  if(g_item['is_gift']) continue;		  
 			  if(g_item['prom_type']==4 ){
@@ -1015,7 +1016,22 @@ Page({
  
 			  }).then(res=>{			  
 				  good=res.data.data;
-			  })
+				})
+				
+				//调用接口判断订单优惠，
+				const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {})
+				if (res.data.code == 0 && res.data.data) {
+						var r_data = res.data.data;
+						if (r_data.ladderLists) {
+								var act_id = r_data.ladderLists[0].form_id;
+								//-- 判断会员能不能参与阶梯促销 --
+								const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {})
+								if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) {
+										b_item.prom_type = 10;
+										b_item.prom_id = data.data.data.id;
+								}
+						}
+				}
  
 			  if(!good){
 				  err_text+= g_item['goods_name']+"未找到商品\n";
@@ -1045,7 +1061,7 @@ Page({
 		      }
  
 			  var prom=null;
-			  var b_item={}
+			 
 			  b_item.goods_id=g_item.goods_id;
 			  b_item.goods_name=g_item.goods_name;
 			  b_item.goods_num=g_item.goods_num;
@@ -1205,6 +1205,7 @@ Page({
         var err_text="";
         for(var i in goods_list){
             var g_item=goods_list[i];
+            var b_item={};
             //--如果是赠品，不加入购物车--
             if(g_item['is_gift']) continue;
             if(g_item['prom_type']==4 ){
@@ -1228,6 +1229,20 @@ Page({
                 good=res.data.data;
             })
  
+            //调用接口判断订单优惠，
+            const res = await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + g_item.goods_id + "/0", {})
+            if (res.data.code == 0 && res.data.data) {
+                var r_data = res.data.data;
+                if (r_data.ladderLists) {
+                    var act_id = r_data.ladderLists[0].form_id;
+                    //-- 判断会员能不能参与阶梯促销 --
+                    const data = await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {})
+                    if (data.data.code == 0 && data.data.data && data.data.data.isuse && data.data.data.is_end == 0) {
+                        b_item.prom_type = 10;
+                        b_item.prom_id = data.data.data.id;
+                    }
+                }
+            }
             if(!good){
                 err_text+= g_item['goods_name']+"未找到商品\n";
                 continue;
@@ -1256,7 +1271,7 @@ Page({
             }
  
             var prom=null;
-            var b_item={}
+            
             b_item.goods_id=g_item.goods_id;
             b_item.goods_name=g_item.goods_name;
             b_item.goods_num=g_item.goods_num;
@@ -1287,7 +1302,6 @@ Page({
                   }
               }
             })
-
             if(!prom) {
                 //--判断商品当前的活动情况--
                 switch (good.prom_type) {
@@ -1342,16 +1356,17 @@ Page({
                             }
                         })
                         break;
-                    case 10:
-                        let user_id = getApp().globalData.userInfo.user_id;
-                        var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`;
-                        await getApp().request.promiseGet(url, {}).then(res => {
-                            if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) {
-                                b_item.prom_type = 10;
-                                b_item.prom_id = res.data.data.id;
-                            }
-                    })
-                    break;
+                        case 10:
+                            
+                            let user_id = getApp().globalData.userInfo.user_id;
+                            var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`;
+                            await getApp().request.promiseGet(url, {}).then(res => {
+                                if (res.data.code == 0 && res.data.data && res.data.data.isuse && res.data.data.is_end == 0) {
+                                    b_item.prom_type = 10;
+                                    b_item.prom_id = res.data.data.id;
+                                }
+                            })
+                            break;
                 }
             }