From 9c8668fd4536ca8385af2b5b05279f5ed776fa32 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 20 Dec 2021 10:53:58 +0800
Subject: [PATCH] 阶梯促销

---
 pages/cart/cart/cart.js                   | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 pages/cart/cart2/ladder_calculate.js      |  3 ++-
 pages/user/order_detail/order_detail.js   | 20 +++++++++++++++++++-
 pages/user/order_detail/order_detail.wxml |  7 ++++++-
 4 files changed, 98 insertions(+), 8 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 7a5ad0c..c6ddec8 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -356,7 +356,6 @@ Page({
                                 })
                             }
                         }
-
                         //--判断优惠活动有没有过期,--
                         else if (item.prom_type == 3) {
                             var isok = 1,is_g_prom=0;
@@ -436,8 +435,6 @@ Page({
 
                             if (!isok) continue;
 
-
-
                         }
                         else if (item.prom_type == 7) {
                             if(!th.data.zuhe_map[item.prom_id]){
@@ -599,9 +596,79 @@ Page({
                                         });
                                         item.prom_type=3;
                                         item.prom_id=r_data.promGoodsLists[0].prom_id;
+                                    }else if(r_data.ladderLists){
+                                        var url = '/api/weshop/cart/update';
+                                        getApp().request.put(url, {
+                                            data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:r_data.ladderLists[0].form_id}
+                                        });
+                                        item.prom_type=10;
+                                        item.prom_id=r_data.ladderLists[0].form_id;
+
                                     }
                                 }
                             })
+
+                            //如果是阶梯购的时候
+                            if(item.prom_type==10){
+                                if(!th.data.ladder_map[item.prom_id]){
+                                    //如果有阶梯购，要判断身份
+                                    var isok = 1;
+                                    var is_flag=1;
+                                    var act=null;
+                                    var url="/api/weshop/prom/ladderForm/getNew/"+os.stoid+"/"+user_id+"/"+item.prom_id;
+                                    await getApp().request.promiseGet(url, {}).then(res => {
+                                        console.log(res,1000);
+                                        if(res.data.code==0 && res.data.data){
+                                            if(res.data.data.isuse!=1){
+                                                isok=0;
+                                            }
+                                            //如果活动已经结束
+                                            if(res.data.data.is_end==1){
+                                                isok=0;
+                                            }
+                                            //已经结束
+                                            if(ut.gettimestamp()>res.data.data.end_time){
+                                                isok=0;
+                                            }
+                                            //还未开始
+                                            if(ut.gettimestamp()<res.data.data.start_time){
+                                                isok=0;
+                                            }
+                                            act=res.data.data;
+
+                                        }else{
+                                            //未找到商品的活动
+                                            isok = 0;
+                                        }
+                                    })
+                                    if (!isok){
+                                        item.prom_type=0;
+                                        item.prom_id=0;
+                                        continue;
+
+                                    }
+                                    th.data.ladder_map[item.prom_id]=act;
+                                    //-- 获取阶梯规则 --
+                                    var url1 = "/api/weshop/prom/ladderList/list";
+                                    var req_data = {
+                                        store_id: os.stoid,
+                                        form_id: item.prom_id,
+                                    }
+                                    await getApp().request.promiseGet(url1, {
+                                        data: req_data
+                                    }).then(rs1 => {
+                                        if (rs1.data.code==0 && rs1.data.data) {
+                                            var gdlist = rs1.data.data;
+                                            th.data.ladder_map[item.prom_id].ladder_list=gdlist;
+                                        }
+                                    })
+                                }
+                                //直接把活动赋值给元素
+                                if(th.data.ladder_map[item.prom_id] && th.data.ladder_map[item.prom_id]!=-1 ){
+                                    item.act=th.data.ladder_map[item.prom_id];
+                                }
+                            }
+
                         }
 
                         all_num += item.goods_num;
@@ -1442,8 +1509,7 @@ Page({
         if(car && car.length>0){
             th.data.in_zhact_gdmap={};
             for (var a = 0; a < car.length; a++) {
-                var item = car[a].goods,
-                    is_s_sele = 1;
+                var item = car[a].goods,is_s_sele = 1;
                 var offline_price=0;
                 var offline_num=0;
                 for (var c = 0; c < item.length; c++) {
diff --git a/pages/cart/cart2/ladder_calculate.js b/pages/cart/cart2/ladder_calculate.js
index 44ad99a..9d0fc31 100644
--- a/pages/cart/cart2/ladder_calculate.js
+++ b/pages/cart/cart2/ladder_calculate.js
@@ -67,7 +67,8 @@ module.exports = {
                 //-- 单个文件新增 --
                 let new_g = JSON.parse(JSON.stringify(end.item));
                 new_g.goods_num = 1;
-                new_g.account = account.toFixed(2);
+                //如果有平摊到单品的时候，account要显示
+                if(!th.data.ispt_goods) new_g.account = account.toFixed(2);
                 new_g.discount = item_j.discount;
                 new_g.goods_price =new_price;
                 new_g.ladder_list_id =item_j.id;
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 630c2db..e93dc83 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -101,7 +101,25 @@ Page({
 				  r.order_status_detail = "组团中";  
 				 
 
-              r['is_all_return'] = 0;
+               r['is_all_return'] = 0;
+
+               var discount_price=r['discount_amount'];
+               var dis_json=r['prom_pt_json'];
+
+               if(dis_json && discount_price){
+                   var prom_pt_json=JSON.parse(dis_json);
+                   var ladder_amount=0;
+                   for (var ll_item of prom_pt_json) {
+                       if(ll_item['ladder_prom_id']){
+                           ladder_amount += ll_item['dis'];
+                       }
+                   }
+                   r['ladder_amount']=ladder_amount;
+                   r['discount_amount']=Math.floor((discount_price-ladder_amount)*100)/100;
+               }
+
+
+
 
                //------获取订单商品-------
                rq.get("/api/weshop/ordergoods/list",{
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index a5e4c00..36ab62f 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -120,7 +120,12 @@
 
             <view class="item pnew" wx:if="{{order.discount_amount>0}}">
                 <view>优惠活动</view>
-                <view>￥ {{order.discount_amount}}元</view>
+                <view>￥ {{filters.toFix(order.discount_amount,2)}}元</view>
+            </view>
+
+            <view class="item pnew" wx:if="{{order.ladder_amount>0}}">
+                <view>阶梯优惠活动</view>
+                <view>￥ {{filters.toFix(order.ladder_amount,2)}}元</view>
             </view>
 
             <view class="item pnew" wx:if="{{order.order_prom_amount>0}}">
--
libgit2 0.21.4