Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 452948f3 8212b000
Showing 4 changed files with 137 additions and 40 deletions
packageE/pages/cart/cart2/cart2.js
packageG/pages/user/my_service/cosmetology_list.js
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -5103,6 +5103,26 @@ Page({
           }
         }
+        //看一下有没有活动不参与的，要记录到order_more表中
+        let can_cx=t_item.show_can_cx;
+        let is_user_no_yhcx=null;
+        for(let iu in can_cx){
+            if(can_cx[iu].no_cj_prom){
+         
+              if(!is_user_no_yhcx) is_user_no_yhcx=[];
+              is_user_no_yhcx.push({
+                  prom_id:can_cx[iu].cur_act.prom_id,
+                  prom_type:can_cx[iu].cur_act.prom_type,
+              })
+              break;
+            }
+        }
+        //如果有活动不参与的，要记录到order_more表中
+        if(is_user_no_yhcx){
+          item.is_user_no_yhcx=JSON.stringify(is_user_no_yhcx);
+        }
+
+
         //代发商品的集合
         var df_goods = [];
         var df_price = 0;
@@ -5112,7 +5132,8 @@ Page({
         //此单的组合活动汇总
         var zh_map_count={};
         var check_map = {};
-        let groupchat_ids=[]
+        let groupchat_ids=[];
+
         //-------------让商品添加到商品列表--------------------
         for (var k = 0; k < t_item.goods.length; k++) {
@@ -5473,6 +5494,8 @@ Page({
     }
     // debugger
     var str = JSON.stringify(pdata);
+    
+
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
@@ -22,13 +22,13 @@ Page({
     projectId:"",//项目id
   },
   onReachBottom: function() {
-    var th = this;
-    if (this.data.total <= th.data.pageSize) return;
-    if (this.data.ismore) return;
-    wx.showLoading({
-      title: '加载中...',
-    })
-    th.query_cology();
+    // var th = this;
+    // if (this.data.total <= th.data.pageSize) return;
+    // if (this.data.ismore) return;
+    // wx.showLoading({
+    //   title: '加载中...',
+    // })
+    // th.query_cology();
   },
   query_cology: function() {
     var th = this;
@@ -42,27 +42,31 @@ Page({
         serviceId: itemId,
         storageId: storageId,
         page: th.data.curpage,
-        pageSize: th.data.pageSize
+        pageSize: 100
       }
     }).then(res => {
       wx.hideLoading();
       if (res.data.code == 0) {
-        th.data.curpage++;
+        // th.data.curpage++;
         var arr1 = th.data.cosmetology_list;
         var arr2 = res.data.data;
         var arr3 = [...arr1, ...arr2];
-      
-    
         th.setData({
           cosmetology_list: arr3,
           total: res.data.data.total,      
           is_service_read: 1,
           is_cosmetology_read:1
         }), wx.stopPullDownRefresh(); //停止下拉刷新
+        if (arr2.length < th.data.pageSize) {
+          th.setData({
+            is_cosmetology_read:1,
+            ismore:1
+          })
+        }
       } else {
         th.setData({
           is_cosmetology_read:1,
-		  ismore:1
+		      ismore:1
         })
       }
     })
@@ -178,6 +178,7 @@ Page({
                         r.use_commission=res.data.data.use_commission;
                         r.pre_cut=res.data.data.pre_cut; //预存款
                         r.pre_json=res.data.data.pre_json; //预存款
+                        r.is_user_no_yhcx = res.data.data.is_user_no_yhcx;  //判断订单是不是优惠促销不参与
                     }
                 })
@@ -911,6 +912,7 @@ Page({
                         })
+                        //商品的订单列表的活动类型，和gg参与的类型不一致
                         if(good.prom_type != gg.prom_type && good.prom_id != gg.prom_id){
                             //如果商品有单独的活动的是偶
                             switch (gg.prom_type){
@@ -923,17 +925,31 @@ Page({
                                 case 3:
                                     var prom=null;
                                     var yh_check=1;
-                                    await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
-                                        if (res.data.code == 0) { prom = res.data.data; }
-                                    })
-                                    if (prom && prom.limit_num) {
-                                        var limit_num = prom.limit_num;
-                                        var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
-                                        if (limit_num>0 && user_pre_buynum >= limit_num) {
+
+
+                                    //如果有优惠促销的普通购买的时候
+                                    if(order.is_user_no_yhcx && good.prom_type==0 && order.is_user_no_yhcx!='0' && order.is_user_no_yhcx!='null' ){
+                                        let obj=JSON.parse(order.is_user_no_yhcx);
+                                        //obj数组使用find函数快速查找
+                                        if(obj.find((item)=>{return item.prom_id==gg.prom_id && item.prom_type==3})){
                                             yh_check=0;
                                         }
                                     }
+                                    //判断优惠促销活动的限购
+                                    if(yh_check){
+                                        await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                                            if (res.data.code == 0) { prom = res.data.data; }
+                                        })
+                                        if (prom && prom.limit_num) {
+                                            var limit_num = prom.limit_num;
+                                            var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+                                            if (limit_num>0 && user_pre_buynum >= limit_num) {
+                                                yh_check=0;
+                                            }
+                                        }
+                                    }
+
                                     //--- 要判断一下优惠促销的商品的限购 ---
                                     if(yh_check){
                                         var pro_gd_limit_num=0;
@@ -957,7 +973,7 @@ Page({
                                             if(gd_limit_rs && gd_limit_rs.data.code==0){
                                                 pro_by_num=gd_limit_rs.data.data.promgoodsbuynum
                                             }
-                                            if(pro_gd_limit_num<=pro_by_num){
+                                            if(pro_gd_limit_num<pro_by_num+good.goods_num){
                                                 yh_check=0;
                                             }
                                         }
@@ -966,6 +982,9 @@ Page({
                                     //-- 优惠促销活动没有超出限购的话 --
                                     if(yh_check){
                                         if(!the_yh_map[gg.prom_id]) the_yh_map[gg.prom_id]=[];
+                                        if(prom)  good.discount_field=prom.discount_field;
+                                        good.r_shop_price=gg.shop_price;
+                                        good.r_market_price=gg.market_price;
                                         the_yh_map[gg.prom_id].push(good);
                                     }
@@ -1020,7 +1039,6 @@ Page({
                         }
                     }
-
                     //如果有普通商品要判断能不到达到优惠促销的条件
                     if(Object.keys(the_yh_map).length){
                         for (let rkey in the_yh_map) {
@@ -1028,7 +1046,17 @@ Page({
                             var all_num=0;
                             for(var ij=0;ij<the_yh_map[rkey].length;ij++){
-                                all_price+=the_yh_map[rkey][ij].goods_price * the_yh_map[rkey][ij].goods_num;
+                                var t_price=the_yh_map[rkey][ij].goods_price;
+                                switch (the_yh_map[rkey][ij].discount_field){
+                                    case 1:
+                                        t_price=the_yh_map[rkey][ij].r_shop_price;
+                                        break;
+                                    case 2:
+                                        t_price=the_yh_map[rkey][ij].r_market_price;
+                                        break;
+                                }
+
+                                all_price+=t_price * the_yh_map[rkey][ij].goods_num;
                                 all_num+= the_yh_map[rkey][ij].goods_num;
                             }
@@ -1051,8 +1079,6 @@ Page({
                         }
                     }
-
-
                     //-- 判断活动是不是OK --
                     if (!t_ok) {
                         th.setData({ paying: 0 }); return false;
@@ -2366,8 +2392,24 @@ Page({
     //-- 查看物流 --
     go_wuliu:function (e) {
         getApp().go_wuliu(e);
-    }
+    },
+    //优惠促销用户参与次数,is_buy=1，表示只获取支付了的
+    async getUserBuyPromNum_pre(prom_id,is_buy) {
+        var userInfo = getApp().globalData.userInfo;
+        var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+        if(is_buy){
+            url = `/api/weshop/ordergoods/getUserBuyPromNum?store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`;
+        }
+        let res = await getApp().request.promiseGet(url, {
+            data: {}
+        });
+        let user_pre_buynum = 0
+        if (res.data.code == 0 && res.data.data) {
+            user_pre_buynum = res.data.data.userbuynum
+        }
+        return user_pre_buynum
+    }
@@ -412,6 +412,7 @@ Page({
               data[ind].use_commission = res.data.data.use_commission;
               data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
               data[ind].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+              data[ind].is_user_no_yhcx = res.data.data.is_user_no_yhcx;  //判断订单是不是优惠促销不参与
             }
           })
@@ -1203,6 +1204,7 @@ Page({
                   })
+                  //商品的订单列表的活动类型，和gg参与的类型不一致
                   if(good.prom_type != gg.prom_type && good.prom_id != gg.prom_id){
                       //如果商品有单独的活动的是偶
                       switch (gg.prom_type){
@@ -1215,16 +1217,30 @@ Page({
                         case 3:
                           var prom=null;
                           var yh_check=1;
-                          await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
-                            if (res.data.code == 0) { prom = res.data.data; }
-                          })
-                          if (prom && prom.limit_num) {
-                            var limit_num = prom.limit_num;
-                            var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
-                            if (limit_num>0 && user_pre_buynum >= limit_num) {
-                              yh_check=0;
-                            }
-                          }
+
+
+                          //如果有优惠促销的普通购买的时候
+                          if(order.is_user_no_yhcx && good.prom_type==0 && order.is_user_no_yhcx!='0' && order.is_user_no_yhcx!='null' ){
+                               let obj=JSON.parse(order.is_user_no_yhcx);
+                               //obj数组使用find函数快速查找
+                               if(obj.find((item)=>{return item.prom_id==gg.prom_id && item.prom_type==3})){
+                                  yh_check=0;
+                               }                                       
+                          } 
+
+                          //判断优惠促销活动的限购
+                          if(yh_check){
+                              await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + gg.prom_id, {}).then(res => {
+                                if (res.data.code == 0) { prom = res.data.data; }
+                              })
+                              if (prom && prom.limit_num) {
+                                var limit_num = prom.limit_num;
+                                var user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id)
+                                if (limit_num>0 && user_pre_buynum >= limit_num) {
+                                  yh_check=0;
+                                }
+                              }
+                         }
                           //--- 要判断一下优惠促销的商品的限购 ---
                           if(yh_check){
@@ -1249,7 +1265,7 @@ Page({
                                 if(gd_limit_rs && gd_limit_rs.data.code==0){
                                    pro_by_num=gd_limit_rs.data.data.promgoodsbuynum
                                 }
-                                if(pro_gd_limit_num<=pro_by_num){
+                                if(pro_gd_limit_num<pro_by_num+good.goods_num){
                                   yh_check=0;
                                 }
                             }
@@ -1258,11 +1274,12 @@ Page({
                           //-- 优惠促销活动没有超出限购的话 --
                           if(yh_check){
                              if(!the_yh_map[gg.prom_id]) the_yh_map[gg.prom_id]=[];
+                             if(prom)  good.discount_field=prom.discount_field;
+                             good.r_shop_price=gg.shop_price;
+                             good.r_market_price=gg.market_price;
                              the_yh_map[gg.prom_id].push(good);
                           }
-                          good.discount_field=prom.discount_field;
-
                           break
                         case 7:
                           //获取组合购活动
@@ -1315,6 +1332,7 @@ Page({
             }
+
             //如果有普通商品要判断能不到达到优惠促销的条件
             if(Object.keys(the_yh_map).length){
               for (let rkey in the_yh_map) {
@@ -1322,7 +1340,17 @@ Page({
                 var all_num=0;
                 for(var ij=0;ij<the_yh_map[rkey].length;ij++){
-                     all_price+=the_yh_map[rkey][ij].goods_price * the_yh_map[rkey][ij].goods_num;
+                     var t_price=the_yh_map[rkey][ij].goods_price;
+                     switch (the_yh_map[rkey][ij].discount_field){
+                       case 1:
+                         t_price=the_yh_map[rkey][ij].r_shop_price;
+                         break;
+                       case 2:
+                         t_price=the_yh_map[rkey][ij].r_market_price;
+                         break;
+                     }
+
+                     all_price+=t_price * the_yh_map[rkey][ij].goods_num;
                      all_num+= the_yh_map[rkey][ij].goods_num;
                 }