wxd / MShopWeApp

Commit 3891a12ab1e81c0cb7537200c532dd2092fb6b8c

Authored by yvan.ni
1 parent 4aa29799

1、预售订单列表 

2、预售测试返回6个bug
Inline Side-by-side
Showing 5 changed files with 103 additions and 64 deletions
packageC/pages/presell/cart/cart.js
  View file @3891a12
... ... @@ -461,14 +461,18 @@ Page({
461 461 return false;
462 462 }
463 463 if(th.data.act.end_time<ut.gettimestamp()) {
464   - getApp().confirmBox("活动的定金时间已经结束");
  464 + getApp().confirmBox("活动的定金时间已经结束",function () {
  465 + ut.wx_back();
  466 + });
465 467 return false;
466 468 }
467 469  
468 470 }
469 471 if(th.data.wait_wk){
470 472 if(th.data.act.pay_enddate<ut.gettimestamp()) {
471   - getApp().confirmBox("活动的尾款时间已经结束");
  473 + getApp().confirmBox("活动的尾款时间已经结束",function () {
  474 + ut.wx_back();
  475 + });
472 476 return false;
473 477 }
474 478 }
... ... @@ -2133,7 +2137,7 @@ Page({
2133 2137 }
2134 2138  
2135 2139 setTimeout(function () {
2136   - th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
  2140 + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time});
2137 2141 }, 1000)
2138 2142  
2139 2143 }, function () {
... ... @@ -2149,7 +2153,7 @@ Page({
2149 2153 //---用余额支付---
2150 2154 getApp().my_warnning("支付成功", 1, th);
2151 2155 setTimeout(function () {
2152   - th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_sh':1,send_time:send_time});
  2156 + th.setData({isclose: 0,'order.order_status':1,'order.pay_status':1,'wait_wk':0,'presell.tail_pay_state':1,'wait_fh':1,send_time:send_time});
2153 2157 }, 1000)
2154 2158 } else {
2155 2159 getApp().my_warnning(t.data.msg, 1, th);
... ... @@ -2207,6 +2211,7 @@ Page({
2207 2211 })
2208 2212 var order=this.data.order;
2209 2213 var order_goods=this.data.order_goods;
  2214 + var user_id=getApp().globalData.userInfo.user_id;
2210 2215  
2211 2216 var wlist="";
2212 2217  
... ... @@ -2262,71 +2267,53 @@ Page({
2262 2267 return false;
2263 2268 }
2264 2269  
2265   - //当是组合优惠的时候
2266   - if(good.prom_type==7){
2267   - //如果有组合购
2268   - var isok = 1;
2269   - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
2270   - await getApp().request.promiseGet(url, {}).then(res => {
2271   - if(res.data.code==0 && res.data.data){
2272   - if(res.data.data.is_show!=1){
2273   - isok=0;
2274   - }
2275   - //如果活动已经结束
2276   - if(res.data.data.is_end==1){
2277   - isok=0;
2278   - }
2279   - //已经结束
2280   - if(ut.gettimestamp()>res.data.data.end_time){
2281   - isok=0;
2282   - }
2283   - //还未开始
2284   - if(ut.gettimestamp()<res.data.data.start_time){
2285   - isok=0;
2286   - }
2287 2270  
2288   - }else{
2289   - //未找到商品的活动
2290   - isok = 0;
2291   - }
2292 2271  
2293   - })
2294   - if (!isok){
2295   - var content=gg.goods_name+'活动已经结束,请取消订单';
2296   - th.toast(content);
2297   - return false;
  2272 + //如果是预售的时候，
  2273 + if(good.prom_type==8){
  2274 + await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{
  2275 + data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id},
  2276 + }).then(e=>{
  2277 + if (e.data.code == 0) {
  2278 + promgoodsbuynum=e.data.data.sumgoodsnum;
2298 2279 }
  2280 + })
2299 2281  
2300   - var url1 = "/api/weshop/prom/zhbuyGoods/page";
2301   - var req_data = {
2302   - page: 1,
2303   - pageSize: 1,
2304   - store_id: os.stoid,
2305   - zh_id: good.prom_id,
2306   - goods_id:good.goods_id
  2282 + var presell_id =good.prom_id;
  2283 + var presellList=null;
  2284 + var url = "/api/weshop/marketing/marketingPresellList/list"
  2285 + var rd = {
  2286 + store_id: os.stoid,
  2287 + presell_id: presell_id,
  2288 + goods_id: good.goods_id
  2289 + }
  2290 + //------获取预售从表----------
  2291 + await getApp().request.promiseGet(url, {
  2292 + data: rd
  2293 + }).then(res => {
  2294 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  2295 + var arr = res.data.data[0];
  2296 + presellList=arr
2307 2297 }
2308   - await getApp().request.promiseGet(url1, {
2309   - data: req_data
2310   - }).then(res => {
2311   - if (ut.ajax_ok(res)) {
2312   - var gdlist = res.data.data.pageData[0];
2313   - good.buyqty=gdlist.buyqty;
2314   - }
2315   - })
  2298 + })
2316 2299  
2317   - var num=good['buyqty'];
2318   - console.log(1111);
2319   - console.log(num);
2320   - //---- 要计算商品的限购 -----
2321   - if(good['buyqty']>0){
2322   - if(good.goods_num+promgoodsbuynum>good['buyqty']){
  2300 + if(presellList){
2323 2301  
2324   - var content= good['goods_name']+"超出活动限购\n";
2325   - th.toast(content);
2326   - return false;
2327   - }
  2302 + if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){
  2303 + var content = gg.goods_name + '购买数量超出商品库存,请取消订单';
  2304 + th.toast(content);
  2305 + return false;
  2306 + }
  2307 + var buyed_mum3 = promgoodsbuynum + good.goods_num;
  2308 + if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) {
  2309 + var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
  2310 + th.toast(content);
  2311 + return false;
2328 2312 }
  2313 +
2329 2314 }
  2315 + }
  2316 +
2330 2317  
2331 2318 //如果优惠促销和搭配购的时候
2332 2319 if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @3891a12
... ... @@ -3989,7 +3989,11 @@ Page({
3989 3989 }
3990 3990 })
3991 3991 if (!pre_arr) {
3992   - wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000})
  3992 + wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000});
  3993 + setTimeout(function () {
  3994 + ut.wx_back();
  3995 + }, 2000)
  3996 + return false;
3993 3997 }
3994 3998 if (func) {
3995 3999 func();
... ...
packageC/pages/presell/list/list.wxml
  View file @3891a12
... ... @@ -43,7 +43,7 @@
43 43 <view class="xc-strip-blank rel">
44 44  
45 45 <view class="flex-vertical rel total">
46   - <view class="t-c abs xc-fill" style="width:{{215*(1-(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty))}}rpx;background:#e4374d;"></view>
  46 + <view class="t-c abs xc-fill" style="width:{{215*(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)}}rpx;background:#e4374d;"></view>
47 47 <text class="fs20 white abs xc-fill-text">已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)}}%</text>
48 48 </view>
49 49  
... ...
pages/index/index/index.wxss
  View file @3891a12
... ... @@ -434,6 +434,7 @@
434 434 display: flex;
435 435 padding: 0 10rpx;
436 436 box-sizing: content-box;
  437 + width: 750rpx !important;
437 438 }
438 439  
439 440 .nav {
... ...
pages/user/order_list/order_list.js
  View file @3891a12
... ... @@ -461,6 +461,7 @@ Page({
461 461 var th = this;
462 462 var order = e;
463 463 var order_goods = e.order_goods;
  464 + var user_id=getApp().globalData.userInfo.user_id;
464 465  
465 466 var wlist = "";
466 467 for (var i in order_goods) {
... ... @@ -482,7 +483,8 @@ Page({
482 483 return false;
483 484 }
484 485 //要每件每件的商品进行检查，看有么有超出库存，超出限购
485   - var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null;
  486 + var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null,presellList=null;
  487 +
486 488 //获取单品的现在的活动状态
487 489 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => {
488 490 gg = res.data.data;
... ... @@ -512,7 +514,6 @@ Page({
512 514 th.toast(content);
513 515 return false;
514 516 }
515   -
516 517 //当是组合优惠的时候
517 518 if (good.prom_type == 7) {
518 519 //如果有组合购
... ... @@ -579,6 +580,52 @@ Page({
579 580 }
580 581 }
581 582  
  583 + //如果是预售的时候，
  584 + if(good.prom_type==8){
  585 + await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{
  586 + data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id},
  587 + }).then(e=>{
  588 + if (e.data.code == 0) {
  589 + promgoodsbuynum=e.data.data.sumgoodsnum;
  590 + }
  591 + })
  592 +
  593 + var presell_id =good.prom_id;
  594 + var url = "/api/weshop/marketing/marketingPresellList/list"
  595 + var rd = {
  596 + store_id: os.stoid,
  597 + presell_id: presell_id,
  598 + goods_id: good.goods_id
  599 + }
  600 + //------获取预售从表----------
  601 + await getApp().request.promiseGet(url, {
  602 + data: rd
  603 + }).then(res => {
  604 + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
  605 + var arr = res.data.data[0];
  606 + presellList=arr
  607 + }
  608 + })
  609 +
  610 + if(presellList){
  611 +
  612 + if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){
  613 + var content = good.goods_name + '购买数量超出商品库存,请取消订单';
  614 + th.toast(content);
  615 + return false;
  616 + }
  617 + var buyed_mum3 = promgoodsbuynum + good.goods_num;
  618 + if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) {
  619 + var content = good.goods_name + '购买数量超出商品限购,请取消订单';
  620 + th.toast(content);
  621 + return false;
  622 + }
  623 +
  624 + }
  625 + }
  626 +
  627 +
  628 +
582 629 //如果优惠促销和搭配购的时候
583 630 if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) {
584 631 var p_ok = 1;
... ...