Merge branch 'dev_oa_fu2' into dev

WXD-SEASON\season
2 parents aa4e5ca3 84af0cad
Showing 7 changed files with 179 additions and 60 deletions
packageB/pages/zuhegou/index/index.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/ladder_calculate.js
pages/cart/cart/cart.js
pages/goods/goodsInfo/goodsInfo.js
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -597,6 +597,16 @@ Page({
           return
         }
+        if(this.data.act.zh_num>0 && this.data.act.zh_num<=this.data.act.zh_buy_num){
+            wx.showToast({
+                title: '组合总数不足！',
+                icon: 'none',
+                duration: 2000
+            })
+            return
+        }
+
+
         //说明是加入购物车是时候
         this.data.is_zuhe_addcart = 1;
         if (!haveAdded) {
@@ -640,14 +650,18 @@ Page({
                 return false;
             } else {
                 //先判断一下线下库存
-                th.check_pk_store_conut(function(){
-                    th.setData({
-                        is_no_pipei: 0
-                    });
-                    th.check_is_in_cart(function () {
-                        th.add_cart_func();
+
+                th.chect_act_zh_num(function (){
+                    th.check_pk_store_conut(function(){
+                        th.setData({
+                            is_no_pipei: 0
+                        });
+                        th.check_is_in_cart(function () {
+                            th.add_cart_func();
+                        })
                     })
                 })
+
             }
         } else {
@@ -2023,6 +2037,13 @@ Page({
     // -- 加入之前，先判断有没有在购物车中,没有商品就添加 --
     check_is_in_cart: function (func) {
+
+        var act=this.data.act;
+        if(act.zh_num>0 && act.zh_num<=act.zh_buy_num){
+            func();
+            return false;
+        }
+
         var th = this;
         var index = th.data.sele_index;
         var txt = "list[" + index + "].haveAdded";
@@ -2518,5 +2539,38 @@ Page({
             }
         }
         return zhqty_bz_flag;
+    },
+
+    chect_act_zh_num(func){
+        var userInfo = getApp().globalData.userInfo;
+        //获取活动信息
+        var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + this.data.id + "/" + userInfo.user_id;
+        getApp().request.get(url, {
+            success: function (e) {
+                if (e.data.code == 0 && e.data.data) {
+                    var t_act=e.data.data;
+                    if(t_act.zh_num>0 && t_act.zh_num<=t_act.zh_buy_num){
+                        wx.showToast({
+                            title: '组合活动不足！',
+                            icon: 'none',
+                            duration: 2000
+                        })
+                        return false;
+                    }
+                    func();
+
+                }else{
+                    wx.showToast({
+                        title: '未找到活动！',
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+
+            }
+        })
     }
+
+
+
 })
 \ No newline at end of file
@@ -714,6 +714,10 @@ Page({
         //---是不是购买等级卡成功的返回---等级卡显示的判断---
         var is_card_back = getApp().globalData.is_card_back;
+
+        //-- 判断组合购是总数量是不是存在 --
+        var no_zh_num={};
+
         for (var i = 0; i < carr.length; i++) {
           var item1 = carr[i];
           //把已经购买了多少见的内容填入
@@ -761,11 +765,20 @@ Page({
             await th.add_prom_goods_map(item1);
           }
-          //要把组合购的东西拿出来算一下
+          //-- 如果组合购的总数量不足的处理 --
+          if(no_zh_num[item1.prom_id] && item1.prom_type == 7){
+            item1.prom_type = 0;
+            item1.prom_type1 = 0;
+            item1.prom_id = 0;
+            item1.prom_id1 = 0
+          }
+
+          //要把组合购的东西拿出来算一下,同时组合购的总数量要有存在
           if (item1.prom_type == 7) {
             if (!th.data.zuhe_map_good[item1.prom_id]) {
               var isok = 1;
               var is_flag = 1;
+              var store_count_ok=1;
               //如果有组合购
               var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
               await getApp().request.promiseGet(url, {}).then(res => {
@@ -778,39 +791,61 @@ Page({
                     isok = 0;
                   }
                   item1.act = res.data.data;
-                  th.data.zhhe_act_map[item1.prom_id] = res.data.data;
+
+                  //-- 在这里要判断一下活动的组合购总数量 --
+                  if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){
+                    store_count_ok = 0;
+                    no_zh_num[item1.prom_id]=1;
+                    //-- 清理一下活动的状态 --
+                    item1.prom_type = 0;
+                    item1.prom_type1 = 0;
+                    item1.prom_id = 0;
+                    item1.prom_id1 = 0
+
+                  }else{
+                    th.data.zhhe_act_map[item1.prom_id] = res.data.data;
+                  }
+
                 } else {
                   //未找到商品的活动
                   is_flag = 0;
                 }
               })
+
               if (!isok) {
                 getApp().my_warnning("组合购的活动已经过期", 0, th);
                 return false;
               }
-              var url1 = "/api/weshop/prom/zhbuyGoods/page";
-              var req_data = {
-                page: 1,
-                pageSize: 2000,
-                store_id: os.stoid,
-                zh_id: item1.prom_id,
-              }
-              await getApp().request.promiseGet(url1, {
-                data: req_data
-              }).then(res => {
-                if (ut.ajax_ok(res)) {
-                  var gdlist = res.data.data.pageData;
-                  gdlist.forEach(i => {
-                    if (item1.goods_id == i.goods_id && !is_flag) {
-                      item1.prom_type = 0;
-                      item1.prom_type1 = 0;
-                      item1.prom_id = 0;
-                      item1.prom_id1 = 0
+
+              //------ 先增组合活动的总数量的时候 -------
+              if(store_count_ok) {
+                  var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                  var req_data = {
+                    page: 1,
+                    pageSize: 2000,
+                    store_id: os.stoid,
+                    zh_id: item1.prom_id,
+                  }
+                  await getApp().request.promiseGet(url1, {
+                    data: req_data
+                  }).then(res => {
+                    if (ut.ajax_ok(res)) {
+                      var gdlist = res.data.data.pageData;
+                      gdlist.forEach(i => {
+                        if (item1.goods_id == i.goods_id && !is_flag) {
+                          item1.prom_type = 0;
+                          item1.prom_type1 = 0;
+                          item1.prom_id = 0;
+                          item1.prom_id1 = 0
+                        }
+                      })
+                      th.data.zuhe_map_good[item1.prom_id] = gdlist;
                     }
                   })
-                  th.data.zuhe_map_good[item1.prom_id] = gdlist;
-                }
-              })
+              }
+
+
+
             }
             else {
               item1.act = th.data.zhhe_act_map[item1.prom_id];
@@ -3982,6 +4017,7 @@ Page({
       var order_prom_list_cart = th.data.order_prom_list_cart;
+
       //--组装推送数据--
       for (var i = 0; i < order_prom_list_cart.length; i++) {
         var t_item = order_prom_list_cart[i];
@@ -4119,6 +4155,8 @@ Page({
         var df_room_ids = "";
+        //此单的组合活动汇总
+        var zh_map_count={};
         var check_map = {};
         let groupchat_ids=[]
         //-------------让商品添加到商品列表--------------------
@@ -4179,6 +4217,7 @@ Page({
             case 7:
               goods.prom_type = 7;
               goods.prom_id = g_item.prom_id;
+              zh_map_count[g_item.prom_id]=1; //汇总一下组合购的活动
               break
             default:
               goods.prom_type = 0;
@@ -4264,7 +4303,14 @@ Page({
         }
-        
+        //-- 如果订单中有组合购 ---
+        if(Object.keys(zh_map_count).length){
+          var zhlist=[];
+          for (var kf in zh_map_count) {
+            zhlist.push({zhid:kf});
+          }
+          item.zhlist=zhlist;
+        }
         //如果房间号不为空的时候
         if (room_ids != "") item.room_ids = ut.sub_last(room_ids);
@@ -4364,6 +4410,8 @@ Page({
     }
     var str = JSON.stringify(pdata);
+    console.log(str,'aaaaaaaaaaaaaaa');
+    //return false;
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
@@ -43,6 +43,7 @@ module.exports = {
                 for (var j = 0; j < item.cart_num; j++) {
                     no_in_arr.push({
                         price: item.goods_price,
+                        goods_market_price:item.goods_market_price,
                         offline_price: item.offline_price,
                         goods_id: item.goods_id,
                         shop_price: item.shop_price,
@@ -65,7 +66,7 @@ module.exports = {
                 if (no_in_arr.length == 0) break;
                 let item_j =ladder_list[j];
                 var end = no_in_arr.pop();
-                var new_price = parseInt(item_j.discount_field) == 1 ? end.shop_price : end.price;
+                var new_price = parseInt(item_j.discount_field) == 2?end.goods_market_price:(parseInt(item_j.discount_field) == 1 ? end.shop_price : end.price);
                 var account=new_price * parseFloat(item_j.discount) / 10;
                 aprice +=account;
@@ -240,7 +241,6 @@ module.exports = {
                 }
             }
-
         }
     }
@@ -838,6 +838,10 @@ Page({
                     if (ut.gettimestamp() < res.data.data.start_time) {
                       isok = 0;
                     }
+                    if(res.data.data.zh_num>0 && res.data.data.zh_num<=res.data.data.zh_buy_num){
+                      isok = 0;
+                    }
+
                     act = res.data.data;
                   } else {
@@ -1973,7 +1973,7 @@ Page({
       }
       //如果有搭配购的时候的时候
-      if(th.data.zh_act  && newd.prom_type==0){
+      if(th.data.zh_act && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num>th.data.zh_act.zh_num )  && newd.prom_type==0){
         newd.prom_type = 7;
         newd.prom_id = th.data.zh_act.id;
       }
@@ -7724,6 +7724,11 @@ Page({
           isok = 0;
         }
+        //还未开始
+        if (res.data.data.zh_num>0 && res.data.data.zh_num<=res.data.data.zh_buy_num ) {
+          isok = 0;
+        }
+
       } else {
         //未找到商品的活动
         isok = 0;
@@ -1222,26 +1222,31 @@ Page({
                           b_item.price = prom.price;
                       }
                       break;
-        case 6:
-            b_item.is_pd_normal = 1;
-            break;
-        case 7:
-            //如果有组合购
-            var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id;
-            await getApp().request.promiseGet(url, {}).then(res => {
-                if (res.data.code == 0 && res.data.data) {
-                    if (res.data.data.is_show == 1 && res.data.data.is_end == 0
-                        && ut.gettimestamp() < res.data.data.end_time
-                        && ut.gettimestamp() > res.data.data.start_time
-                    ) {
-                        b_item.prom_type = 7;
-                        b_item.prom_id = res.data.data.id;
-                        good.prom_type = 7;
-                        good.prom_id = res.data.data.id;
-                    }
-                }
-            })
-                            break;
+                    case 6:
+                        b_item.is_pd_normal = 1;
+                        break;
+                    case 7:
+                        //如果有组合购
+                        var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id;
+                        await getApp().request.promiseGet(url, {}).then(res => {
+                            if (res.data.code == 0 && res.data.data) {
+
+                                var t_act=res.data.data;
+                                if(!t_act.zh_num || t_act.zh_num>t_act.zh_buy_num) {
+
+                                    if (res.data.data.is_show == 1 && res.data.data.is_end == 0
+                                        && ut.gettimestamp() < res.data.data.end_time
+                                        && ut.gettimestamp() > res.data.data.start_time
+                                    ) {
+                                        b_item.prom_type = 7;
+                                        b_item.prom_id = res.data.data.id;
+                                        good.prom_type = 7;
+                                        good.prom_id = res.data.data.id;
+                                    }
+                                }
+                            }
+                        })
+                        break;
                     case 10:
                         var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`;
@@ -1252,7 +1257,7 @@ Page({
                                 }
                             })
                         break;
-        }
+                  }
 			  //如果有优惠促销的时候,要看下商品的优惠活动有没有过期
@@ -1583,13 +1583,16 @@ Page({
             var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id;
             await getApp().request.promiseGet(url, {}).then(res => {
               if (res.data.code == 0 && res.data.data) {
-                if (res.data.data.is_show == 1 && res.data.data.is_end == 0
-                  && ut.gettimestamp() < res.data.data.end_time
-                  && ut.gettimestamp() > res.data.data.start_time
-                ) {
-                  b_item.prom_type = 7;
-                  b_item.prom_id = res.data.data.id;
+                var t_act=res.data.data;
+                if(!t_act.zh_num || t_act.zh_num>t_act.zh_buy_num) {
+                    if (res.data.data.is_show == 1 && res.data.data.is_end == 0
+                        && ut.gettimestamp() < res.data.data.end_time
+                        && ut.gettimestamp() > res.data.data.start_time
+                    ) {
+                      b_item.prom_type = 7;
+                      b_item.prom_id = res.data.data.id;
+                    }
                 }
               }
             })