1. 视频号商品在支付拼团尾款的时候要带场景

2. 多赠品的优化

1. 视频号商品在支付拼团尾款的时候要带场景
2. 多赠品的优化
yvan.ni
1 parent 6be0cc8c
Showing 4 changed files with 149 additions and 123 deletions
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart2/cart2.js
pages/cart/cart_wk/cart_wk.js
@@ -2952,7 +2952,6 @@ Page({
                 th.data.promgoods_list[p_item[0]]=promgoods_list;
             }
-            var is_duo_gift=0;
             for (var i in promgoods_list) {
                 var item = promgoods_list[i];
                 if (item.prom_type == 0) {
@@ -2965,21 +2964,6 @@ Page({
                         }
                         make_up_arr.push(elem);
                         break;
-                    }else{
-                        var json=JSON.parse(item.preferential_type);
-                        json.prom_id=prom.id;
-                        json.prom_name=prom.name;
-                        if(json.is_gift){
-
-                                var idx=send_gift_arr.findIndex(function (e) {
-                                    return e.prom_id==prom.id;
-                                })
-                                if(idx!=-1){
-                                    send_gift_arr[idx]=json;
-                                }else {
-                                    send_gift_arr.push(json);
-                                }
-                        }
                     }
                 } else {
                     if (ob.num < item.condition) {
@@ -2991,35 +2975,13 @@ Page({
                         }
                         make_up_arr.push(elem);
                         break;
-                    }else{
-                        var json=JSON.parse(item.preferential_type);
-                        json.prom_id=prom.id;
-                        json.prom_name=prom.name;
-                        if(json.is_gift){
-                            var idx=send_gift_arr.findIndex(function (e) {
-                                return e.prom_id==prom.id;
-                            })
-                            if(idx!=-1){
-                                send_gift_arr[idx]=json;
-                            }else {
-                                send_gift_arr.push(json);
-                            }
-                        }
                     }
                 }
             }
-            //找到要送的活动
-            var idx=send_gift_arr.findIndex(function (e) {
-                return e.prom_id==prom.id;
-            })
-            if(idx!=-1){
-                var cur_json=send_gift_arr[idx];
-                if(parseInt(cur_json.zp_mode)==1) is_duo_gift=1;
-            }
-            //-- 只有在单赠品的时候，才要进行计算 --
-            if(!is_duo_gift && idx>-1) {
+
+                //-- 只有在单赠品的时候，才要进行计算 --
                 await getApp().request.promiseGet("/api/weshop/goods/getDiscount", {
                     data: {
                         price: ob.price,
@@ -3032,80 +2994,107 @@ Page({
                     if (res.data.code == 0) discount = res.data.data;
                 })
-                if(!discount.zp_num || parseInt(discount.zp_num)==0) discount.zp_num=1;
-                //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
-                if (discount && discount['goods_id'] && discount.limit_num >= discount.bs*discount.zp_num
-                    && discount.gift_storecount >= discount.bs*discount.zp_num) {
-                    //如果这礼品超了情况下
-                    if (no_gift_arr.indexOf(discount.gift_id) != -1) continue;
-                    var o = discount.goodsinfo;
-                    //-- 默认等于1，兼容旧的活动 --
-
-                    var newd = {
-                        goods_id: o.goods_id,
-                        goods_num: discount.bs*discount.zp_num, //是赠品的翻倍
-                        pick_id: list.pid,
-                        user_id: app.globalData.user_id,
-                        store_id: os.stoid,
-                        goods_price: 0,
-                        guide_id: ob.guide_id ? ob.guide_id : 0,
-                        guide_type: ob.guide_type ? ob.guide_type : 0,
-                        member_goods_price: 0,
-                        goods_name: o.goods_name,
-                        goods_sn: o.goods_sn,
-                        sku: o.sku,
-                        is_gift: 1,
-                        prom_id: p_item[0],
-                        prom_type: 3,
-                        selected: 1,
-                        gift_id: discount.gift_id,
-                        original_img: th.data.imgUrl + o.original_img
-                    };
-
-                    list2.goods.push(newd);
-                    var all_num = 0;
-                    var all_limit_num = 0;
-
-                    for (var i in alllist) {
-                        var list_item = alllist[i];
-                        for (var j in list_item.goods) {
-                            //如果赠品的ID一样，要进行统计数量
-                            if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id) {
-                                all_num += list_item.goods[j].goods_num;
-                            }
-                            if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id && list_item.goods[j].prom_id == p_item[0]) {
-                                all_limit_num += list_item.goods[j].goods_num;
-                            }
-
-                        }
-                    }
-
-                    //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
-                    if (discount.gift_storecount < all_num || discount.limit_num < all_limit_num) {
-                        no_gift_arr.push(discount.gift_id);
-                        //--进入下一个循环 --
-                        continue;
-                    }
-
-
-                    var url = "/api/weshop/cart/delGift?store_id=" + newd.store_id + "&user_id=" +
-                        newd.user_id + "&goods_id=" + newd.goods_id + "&is_gift=1&pick_id=" + newd.pick_id + "&prom_id=" + newd.prom_id
-                    await getApp().request.promiseDelete(url, {})
-
-                    var add_data = null;
-                    await getApp().request.promisePost("/api/weshop/cart/save", {
-                        data: newd
-                    }).then(res => {
-                        if (res.data.code == 0) {
-                            add_data = res.data.data;
-                        }
-                    })
-                    if (add_data) {
-                        newd.id = add_data.id;
-                        list.goods.push(newd);
-                    }
-                }
-            }
+                 if(discount) {
+
+                     if (!discount.zp_num || parseInt(discount.zp_num) == 0) discount.zp_num = 1;
+                     //判断一下赠品的模式
+                     if (parseInt(discount.zp_mode)== 1 )
+                     {
+
+                         var a_stock_num=0;
+                         var a_limit_num=0;
+                         for(let iy in discount.giftsinfo){
+                             let item=discount.giftsinfo[iy];
+                             a_stock_num+= parseInt(item.gift_storecount);
+                             a_limit_num+=parseInt(item.limit_num);
+                         }
+
+                         var t_zp_num=parseInt(discount.zp_num)*parseInt(discount.bs);
+                         if(a_limit_num>=t_zp_num  && a_stock_num>=t_zp_num ) {
+
+                             var json={};
+                             json.prom_id=prom.id;
+                             json.prom_name=prom.name;
+                             send_gift_arr.push(json);
+                         }
+
+                     }
+                     else
+                     {
+                         //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
+                         if (discount && discount['goods_id'] && discount.limit_num >= discount.bs * discount.zp_num
+                             && discount.gift_storecount >= discount.bs * discount.zp_num) {
+                             //如果这礼品超了情况下
+                             if (no_gift_arr.indexOf(discount.gift_id) != -1) continue;
+                             var o = discount.goodsinfo;
+                             //-- 默认等于1，兼容旧的活动 --
+
+                             var newd = {
+                                 goods_id: o.goods_id,
+                                 goods_num: discount.bs * discount.zp_num, //是赠品的翻倍
+                                 pick_id: list.pid,
+                                 user_id: app.globalData.user_id,
+                                 store_id: os.stoid,
+                                 goods_price: 0,
+                                 guide_id: ob.guide_id ? ob.guide_id : 0,
+                                 guide_type: ob.guide_type ? ob.guide_type : 0,
+                                 member_goods_price: 0,
+                                 goods_name: o.goods_name,
+                                 goods_sn: o.goods_sn,
+                                 sku: o.sku,
+                                 is_gift: 1,
+                                 prom_id: p_item[0],
+                                 prom_type: 3,
+                                 selected: 1,
+                                 gift_id: discount.gift_id,
+                                 original_img: th.data.imgUrl + o.original_img
+                             };
+
+                             list2.goods.push(newd);
+                             var all_num = 0;
+                             var all_limit_num = 0;
+
+                             for (var i in alllist) {
+                                 var list_item = alllist[i];
+                                 for (var j in list_item.goods) {
+                                     //如果赠品的ID一样，要进行统计数量
+                                     if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id) {
+                                         all_num += list_item.goods[j].goods_num;
+                                     }
+                                     if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == newd.gift_id && list_item.goods[j].prom_id == p_item[0]) {
+                                         all_limit_num += list_item.goods[j].goods_num;
+                                     }
+
+                                 }
+                             }
+
+                             //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
+                             if (discount.gift_storecount < all_num || discount.limit_num < all_limit_num) {
+                                 no_gift_arr.push(discount.gift_id);
+                                 //--进入下一个循环 --
+                                 continue;
+                             }
+
+
+                             var url = "/api/weshop/cart/delGift?store_id=" + newd.store_id + "&user_id=" +
+                                 newd.user_id + "&goods_id=" + newd.goods_id + "&is_gift=1&pick_id=" + newd.pick_id + "&prom_id=" + newd.prom_id
+                             await getApp().request.promiseDelete(url, {})
+
+                             var add_data = null;
+                             await getApp().request.promisePost("/api/weshop/cart/save", {
+                                 data: newd
+                             }).then(res => {
+                                 if (res.data.code == 0) {
+                                     add_data = res.data.data;
+                                 }
+                             })
+                             if (add_data) {
+                                 newd.id = add_data.id;
+                                 list.goods.push(newd);
+                             }
+                         }
+                     }
+                 }
         }
         //--更新购物车的前台渲染--
@@ -3126,9 +3115,6 @@ Page({
             });
         }
-        send_gift_arr=send_gift_arr.filter(function (e) {
-            return e.zp_mode==="1";
-        })
         var gift_text = "requestData[" + cindex + "].send_gift_arr";
         //-- 如果有凑单的话 --
         if (send_gift_arr.length > 0) {
@@ -162,7 +162,7 @@
           <!-- 赠品的提示  -->
           <block wx:if="{{item.send_gift_arr}}">
-              <view bindtap="show_gift_toast"  wx:for="{{item.send_gift_arr}}" wx:if="{{item.zp_mode}}"
+              <view bindtap="show_gift_toast"  wx:for="{{item.send_gift_arr}}"
                     class="fs28 pdr20 pdl20 pdb20 c-red2 flex jc_sb" style="padding: 10rpx 30rpx">
                   <text style="color: #333333">送赠品</text>
                   <text  bindtap="tishi_gift">{{item.prom_name}}></text>
@@ -1210,7 +1210,13 @@ Page({
                                 item_map.s_intValue = get_data.intValue;
                                 item_map.s_coupon_id = get_data.coupon_id;
                                 item_map.s_coupon_num = get_data.coupon_num;
-                                if (get_data.gift_id && get_data.goodsinfo) {
+
+
+                                if (get_data.gift_id && parseInt(get_data.zp_mode)!=1
+                                    && get_data.zp_num* item_map.bs<=get_data.limit_num
+                                    && get_data.zp_num* item_map.bs<=get_data.gift_storecount
+                                ){
+
                                     item_map.gift_id = get_data.gift_id;
                                     item_map.gift_goods_id = get_data.goods_id;
                                     item_map.gift_goods_name = get_data.goods_name;
@@ -1233,9 +1239,26 @@ Page({
                                 if(parseInt(get_data.zp_mode)==1){
                                     if(!send_gf[pickid])  send_gf[pickid]=[];
-                                    send_gf[pickid].push({
-                                        pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num*get_data.bs,
-                                        gf_pr_name:item_map.name,prom_id:item_map.prom_id});
+
+                                    var a_stock_num=0;
+                                    var a_limit_num=0;
+                                    for(let iy in get_data.giftsinfo){
+                                        let item=get_data.giftsinfo[iy];
+                                        a_stock_num+= parseInt(item.gift_storecount);
+                                        a_limit_num+=parseInt(item.limit_num);
+                                    }
+
+                                    var t_zp_num=parseInt(get_data.zp_num)*parseInt(get_data.bs);
+                                    if(a_limit_num>=t_zp_num && a_stock_num>=t_zp_num) {
+
+                                        send_gf[pickid].push({
+                                            pickup_id: pickid,
+                                            giftsinfo: get_data.giftsinfo,
+                                            zp_num: get_data.zp_num * get_data.bs,
+                                            gf_pr_name: item_map.name,
+                                            prom_id: item_map.prom_id
+                                        });
+                                    }
                                 }
                             }
                         })
@@ -4080,9 +4103,23 @@ Page({
                 var pickid=gg.pick_id;
                 if(parseInt(get_data.zp_mode)==1){
                     if(!send_gf[pickid])  send_gf[pickid]=[];
-                    send_gf[pickid].push({
+
+                    var a_stock_num=0;
+                    var a_limit_num=0;
+                    for(let iy in get_data.giftsinfo){
+                    	let item=get_data.giftsinfo[iy];
+                        a_stock_num+= parseInt(item.gift_storecount);
+                        a_limit_num+=parseInt(item.limit_num);
+                    }
+
+                    var t_zp_num=parseInt(get_data.zp_num)*parseInt(get_data.bs);
+                    if(a_limit_num>= t_zp_num && a_stock_num>=t_zp_num ){
+                        send_gf[pickid].push({
                         pickup_id:pickid,giftsinfo:get_data.giftsinfo,zp_num:get_data.zp_num*get_data.bs,
                         gf_pr_name:prom.name,prom_id:prom.prom_id});
+
+                    }
+
                     th.setData({send_gf:send_gf});
                 }
             }
@@ -376,6 +376,9 @@ Page({
       dd.shipping_price = parseFloat(th.data.exp_price);
       dd.addressid = th.data.user_addr.address_id;
     }
+    if(getApp().globalData.scene){
+      dd.scene=getApp().globalData.scene;
+    }
     var arr = [];
     arr.push(dd);