From 295ec485ad8379e31533ecd85ce015359fa4436e Mon Sep 17 00:00:00 2001 From: banche Date: Tue, 7 Dec 2021 20:02:21 +0800 Subject: [PATCH] 幸运购待支付 --- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 2 +- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 437 ++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml | 17 +++++++---------- pages/user/order_detail/order_detail.js | 27 +++------------------------ pages/user/order_list/order_list.js | 1 - 5 files changed, 35 insertions(+), 449 deletions(-) diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 814fa70..012270e 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -3902,7 +3902,7 @@ Page({ if (a.confirm) { switOn = false; wx.navigateTo({ - url: "/pages/user/order_detail/order_detail?order_id=" + res.data.data.pageData[0]['order_id'] + url: "/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=" + res.data.data.pageData[0]['order_id'] }); } } diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index e94fff8..d6c761b 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -318,429 +318,40 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { - var th=this; - if(this.data.optionIsGoup) - wx.navigateTo({ - url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true" - }) - var order=this.data.order; - var order_goods=order.order_goods; - var user_id=order.user_id; - - var wlist=""; - for(var i in order_goods){ - var good=order_goods[i]; - //线下取价功能已经关闭或者过期 - if(!th.data.is_open_offline && good.offline_cut>0){ - wx.showModal({ - title: '提示', - content: '线下取价功能已经关闭或者过期！' - }); - return false; - } - - //要每件每件的商品进行检查，看有么有超出库存，超出限购 - var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null; - //获取单品的现在的活动状态 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, { - }).then(res=>{ - gg=res.data.data; - }) - var limit = gg.viplimited; - var store_count = gg.store_count; - good.erpwareid=gg.erpwareid; - - //---要获得商品，该用户买了多少件,同步应用--- - await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { - data: { - store_id: os.stoid, - user_id: getApp().globalData.user_id, - goods_id: good.goods_id, - prom_type: good.prom_type, - prom_id: good.prom_id - }, - }).then(res => { - var buy_num_data = res.data.data; - if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; - goodsbuynum = buy_num_data.goodsbuynum; - }) - - var buyed_mum2=goodsbuynum+good.goods_num; - if (buyed_mum2 > limit && limit > 0) { - - var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; - th.toast(content); - return false; - } - - //当是组合优惠的时候 - if(good.prom_type==7){ - //如果有组合购 - var isok = 1; - 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){ - isok=0; - } - //如果活动已经结束 - if(res.data.data.is_end==1){ - isok=0; - } - //已经结束 - if(ut.gettimestamp()>res.data.data.end_time){ - isok=0; - } - //还未开始 - if(ut.gettimestamp() { - if (ut.ajax_ok(res)) { - var gdlist = res.data.data.pageData[0]; - good.buyqty=gdlist.buyqty; - } - }) - - var num=good['buyqty']; - console.log(1111); - console.log(num); - //---- 要计算商品的限购 ----- - if(good['buyqty']>0){ - if(good.goods_num+promgoodsbuynum>good['buyqty']){ + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} + if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { + var aid = this.data.order.order_goods['0']['prom_id']; + var knum = 0; + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { + }).then(res => { + if (res.data.code == 0) { + knum = res.data.data; + } + + }); - var content= good['goods_name']+"超出活动限购\n"; - th.toast(content); - return false; - } - } - } + if (knum <= 0) { + getApp().confirmBox("库存为0，支付失败"); + return false; + } - //如果优惠促销和搭配购的时候 - if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ - var p_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - if(!r_data.collocationPromList && good.prom_type==5){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - if(!r_data.promGoodsLists && good.prom_type==3){ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }else{ - - var content=good.goods_name+'未找到活动,请取消订单重新购买'; - th.toast(content); - p_ok=0; - } - }) - if(!p_ok) return false; } - - //商品的普通购买 ，不要进行判断 - if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){ - if(gg.prom_type!=good.prom_type && gg.prom_type>0) { - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - }else{ - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { - var prom=null; - //---如果是活动的时候--- - var prom=null,th=this; - if(gg.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (gg.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(gg.prom_type==6){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(gg.prom_type==4){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - if(prom){ - var t_now=ut.gettimestamp(); - if(prom.is_end==0 && prom.start_timet_now){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - } - else{ - //不是赠品的时候 - if(!good.is_gift && good.prom_type!=3){ - var t_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - //-- 参加了全局的优惠活动 -- - if(r_data.promGoodsLists){ - - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; - th.toast(content); - t_ok=0; - } - } - }) - if(!t_ok) return false; - } - //-- 如果有参加线下取价 -- - if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; - } - //赠品和搭配购不判断商品金额 - var isok=1; - var card_field=th.data.card_field; - //如果会员是等级会员,商品有等级价,且不是活动商品 - if(!good.is_gift && !good.is_collocation) { - if (card_field && gg[card_field] > 0) { - if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0; - if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - - } else { - if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0; - if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 - } - var is_h=0; - if (!isok) { - - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - //--如果是线下库存的时候-- - if(th.data.conf.sales_rules==2){ - var ob={}; - await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ - ob=obj; - }) - if(ob.code==-1){ - - var content=gg.goods_name+'门店库存不足,请取消订单'; - th.toast(content); - return false; - } - - }else{ - if(good.goods_num>store_count){ - - var content=gg.goods_name+'商品的库存不足,请取消订单'; - th.toast(content); - return false; - } - - } - } - - console.log("------------------------------------"); - //---如果是活动的时候--- - var prom=null,goodsinfo=good,th=this; - if(goodsinfo.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - prom.price=prom.user_price; - } - }) - } - - if (goodsinfo.prom_type == 2) { - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { - if (res.data.code == 0) { - prom = res.data.data; - prom.price=prom.price; - } - }) - } - - - if(goodsinfo.prom_type==6 && !good.is_pd_normal){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(goodsinfo.prom_type==4 && !good.is_integral_normal){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - //----------如果有活动，并且在进行中，就不计算线下库存--------------- - if(prom){ - var now=ut.gettimestamp(); - if(prom.is_end==1 && prom.end_time prom.buy_limit && prom.buy_limit > 0) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买'; - th.toast(content); - return false; - } - //看一下会员的秒杀价格是不是发生了变化 - if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - - //看一下会员的团购价格是不是发生了变化 - if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; - th.toast(content); - return false; - } - - if(goodsinfo.prom_type==4){ - if (good.goods_num > prom.limitqty-prom.buy_num) { - - var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'; - th.toast(content); - return false; - } - }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { - if(order.add_time+5*600){ - wlist=ut.sub_last(wlist); - var keyid=order.pickup_id; - var user_info=getApp().globalData.userInfo; - if(!keyid) return false; - var offarr=null; - await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { - data:{ - VIPId:encodeURIComponent(user_info.erpvipid), - store_id:os.stoid, - PickupId:keyid, - WareIds:wlist}, - }, - ).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.length>0){ - offarr=res.data.data; - } - }) - if(!offarr && offarr.length<=0 ){ - wx.showModal({ title: '获取线下取价失败',}); - } - var newarr=ut.convert_arr_key(offarr,'WareId'); - //-- 循环判断线下的价格 -- - for(var k in order_goods){ - var good=order_goods[k]; - //判断线下取价是不是一样 - if(newarr[good.erpwareid] && - parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){ - - var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; - th.toast(content); - return false; - } - } - - } - - /*--- - o.jumpToCart4({ - order_sn: this.data.order.order_sn, - order_amount: this.data.order.order_amount, - type: 1 //正常单 - }, 1);--*/ - py.pay(this.data.order.order_sn, function() { - wx.showToast({title: '支付成功'}) - wx.navigateBack(); + wx.showToast({title: '支付成功'}) + wx.navigateBack(); },null,os.stoid,1); - }, + }, + checkTeam: function() { wx.navigateTo({ url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index 500d95b..34b2668 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -173,7 +173,7 @@ - + @@ -205,12 +205,9 @@ url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价 去评价 - --> - - + + + diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 2c88752..06114b2 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -317,26 +317,6 @@ Page({ //--------立即支付---------- async jumpToCart4(e) { - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} - if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { - var aid = this.data.order.order_goods['0']['prom_id']; - var knum = 0; - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { - }).then(res => { - if (res.data.code == 0) { - knum = res.data.data; - } - - }); - - if (knum <= 0) { - getApp().confirmBox("库存为0，支付失败"); - return false; - } - - } - - var th=this; if(this.data.optionIsGoup) wx.navigateTo({ @@ -588,8 +568,7 @@ Page({ return false; } } - } - else{ + }else{ //不是赠品的时候 if(!good.is_gift && good.prom_type!=3){ var t_ok=1; @@ -613,7 +592,7 @@ Page({ } //赠品和搭配购不判断商品金额 var isok=1; - var card_field=th.data.card_field; + var card_field=th.data.card_field; // 会员等级 //如果会员是等级会员,商品有等级价,且不是活动商品 if(!good.is_gift && !good.is_collocation) { if (card_field && gg[card_field] > 0) { @@ -627,7 +606,7 @@ Page({ var is_h=0; if (!isok) { - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; + var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22'; th.toast(content); return false; } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 1c1a63d..c73fdd1 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -510,7 +510,6 @@ Page({ } } - var wlist = ""; for (var i in order_goods) { -- libgit2 0.21.4