Commit 7bc648b04bc3a2d5b97f0790224b736927c97202
1 parent
8a2a976d
预存的使用情况的优化
Showing
2 changed files
with
1 additions
and
189 deletions
packageG/pages/user/order_detail/order_detail.js
| @@ -431,100 +431,6 @@ Page({ | @@ -431,100 +431,6 @@ Page({ | ||
| 431 | var user_id=order.user_id; | 431 | var user_id=order.user_id; |
| 432 | 432 | ||
| 433 | 433 | ||
| 434 | - //如果使用预存的话，要重新效验下预存金额是否足够 | ||
| 435 | - if(order.pre_cut && order.pre_json){ | ||
| 436 | - let pickup_id=order.pickup_id | ||
| 437 | - let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {}) | ||
| 438 | - let keyid = res.data.data.keyid | ||
| 439 | - let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json) | ||
| 440 | - if(resdata.code !=0){ | ||
| 441 | - let msg=resdata.msg || "预存金额不足" | ||
| 442 | - getApp().confirmBox(msg); | ||
| 443 | - th.setData({ paying: 0 }); | ||
| 444 | - return false; | ||
| 445 | - } | ||
| 446 | - | ||
| 447 | - var listform=[]; | ||
| 448 | - var adv_num=0; | ||
| 449 | - order_goods.map(ite => { | ||
| 450 | - //-- 不是赠品的时候 -- | ||
| 451 | - if(!ite.is_gift) { | ||
| 452 | - let obj = { | ||
| 453 | - wareno: ite.goods_sn, | ||
| 454 | - price: ite.first_account, //account是平摊后的实收价格 | ||
| 455 | - qty: ite.goods_num, | ||
| 456 | - sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2) | ||
| 457 | - } | ||
| 458 | - | ||
| 459 | - adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0); | ||
| 460 | - listform.push(obj) | ||
| 461 | - } | ||
| 462 | - }) | ||
| 463 | - | ||
| 464 | - adv_num=parseFloat(adv_num).toFixed(2); | ||
| 465 | - let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | ||
| 466 | - data: { | ||
| 467 | - accdb: getApp().globalData.config.erpid, | ||
| 468 | - ApiName: 'api.pos.shop.advancesum.seek', | ||
| 469 | - usercode: "admin", | ||
| 470 | - vipid: getApp().globalData.userInfo.erpvipid, | ||
| 471 | - oddsum: "0", | ||
| 472 | - advancesum: adv_num, | ||
| 473 | - storageid: keyid, | ||
| 474 | - listform | ||
| 475 | - }, | ||
| 476 | - is_json: 1 | ||
| 477 | - }) | ||
| 478 | - if(!res1 && res1.data.code!=0 ){ | ||
| 479 | - getApp().confirmBox("获取预存的金额失败"); | ||
| 480 | - th.setData({ paying: 0 }); | ||
| 481 | - return false; | ||
| 482 | - } | ||
| 483 | - | ||
| 484 | - if(res1.data.data.length<=0){ | ||
| 485 | - getApp().confirmBox("每天每人仅能使用1次预存抵扣"); | ||
| 486 | - th.setData({ paying: 0 }); | ||
| 487 | - return false; | ||
| 488 | - } | ||
| 489 | - | ||
| 490 | - var yck=0 | ||
| 491 | - let resData = res1.data.data | ||
| 492 | - resData.map(ite => { | ||
| 493 | - yck += ite.advancesum*1 | ||
| 494 | - }) | ||
| 495 | - if(yck<=0){ | ||
| 496 | - getApp().confirmBox("每天每人仅能使用1次预存抵扣"); | ||
| 497 | - th.setData({ paying: 0 }); | ||
| 498 | - return false; | ||
| 499 | - } | ||
| 500 | - | ||
| 501 | - if(order.pre_cut && yck!=order.pre_cut){ | ||
| 502 | - getApp().confirmBox("获取预存的金额不对"); | ||
| 503 | - th.setData({ paying: 0 }); | ||
| 504 | - return false; | ||
| 505 | - } | ||
| 506 | - | ||
| 507 | - | ||
| 508 | - } | ||
| 509 | - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} | ||
| 510 | - if (parseInt(order_goods['0']['prom_type']) == 9) { | ||
| 511 | - var aid = order_goods['0']['prom_id']; | ||
| 512 | - var knum = 0; | ||
| 513 | - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { | ||
| 514 | - }).then(res => { | ||
| 515 | - if (res.data.code == 0) { | ||
| 516 | - knum = res.data.data; | ||
| 517 | - } | ||
| 518 | - }); | ||
| 519 | - | ||
| 520 | - if (knum <= 0) { | ||
| 521 | - getApp().confirmBox("库存为0，支付失败"); | ||
| 522 | - th.setData({ paying: 0 }); | ||
| 523 | - return false; | ||
| 524 | - } | ||
| 525 | - | ||
| 526 | - | ||
| 527 | - } | ||
| 528 | 434 | ||
| 529 | var wlist = ""; | 435 | var wlist = ""; |
| 530 | var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销 | 436 | var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销 |
pages/user/order_list/order_list.js
| @@ -716,102 +716,8 @@ Page({ | @@ -716,102 +716,8 @@ Page({ | ||
| 716 | var order = e; | 716 | var order = e; |
| 717 | var order_goods = e.order_goods; | 717 | var order_goods = e.order_goods; |
| 718 | var user_id = getApp().globalData.userInfo.user_id; | 718 | var user_id = getApp().globalData.userInfo.user_id; |
| 719 | - | ||
| 720 | - //如果使用预存的话，要重新效验下预存金额是否足够 | ||
| 721 | - if(order.pre_cut && order.pre_json){ | ||
| 722 | - let pickup_id=order.pickup_id | ||
| 723 | - let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {}) | ||
| 724 | - let keyid = res.data.data.keyid | ||
| 725 | - let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json) | ||
| 726 | - if(resdata.code !=0){ | ||
| 727 | - let msg=resdata.msg || "预存金额不足" | ||
| 728 | - getApp().confirmBox(msg); | ||
| 729 | - th.setData({ paying: 0 }); | ||
| 730 | - return false; | ||
| 731 | - } | ||
| 732 | - | ||
| 733 | - var listform=[]; | ||
| 734 | - var adv_num=0; | ||
| 735 | - order_goods.map(ite => { | ||
| 736 | - //-- 不是赠品的时候 -- | ||
| 737 | - if(!ite.is_gift) { | ||
| 738 | - let obj = { | ||
| 739 | - wareno: ite.goods_sn, | ||
| 740 | - price: ite.first_account, //account是平摊后的实收价格 | ||
| 741 | - qty: ite.goods_num, | ||
| 742 | - sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2) | ||
| 743 | - } | ||
| 744 | - | ||
| 745 | - adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0); | ||
| 746 | - listform.push(obj) | ||
| 747 | - } | ||
| 748 | - }) | ||
| 749 | - | ||
| 750 | - adv_num=parseFloat(adv_num).toFixed(2); | ||
| 751 | - let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { | ||
| 752 | - data: { | ||
| 753 | - accdb: getApp().globalData.config.erpid, | ||
| 754 | - ApiName: 'api.pos.shop.advancesum.seek', | ||
| 755 | - usercode: "admin", | ||
| 756 | - vipid: getApp().globalData.userInfo.erpvipid, | ||
| 757 | - oddsum: "0", | ||
| 758 | - advancesum: adv_num, | ||
| 759 | - storageid: keyid, | ||
| 760 | - listform | ||
| 761 | - }, | ||
| 762 | - is_json: 1 | ||
| 763 | - }) | ||
| 764 | - if(!res1 && res1.data.code!=0 ){ | ||
| 765 | - getApp().confirmBox("获取预存的金额失败"); | ||
| 766 | - th.setData({ paying: 0 }); | ||
| 767 | - return false; | ||
| 768 | - } | ||
| 769 | - | ||
| 770 | - if(res1.data.data.length<=0){ | ||
| 771 | - getApp().confirmBox("每天每人仅能使用1次预存抵扣"); | ||
| 772 | - th.setData({ paying: 0 }); | ||
| 773 | - return false; | ||
| 774 | - } | ||
| 775 | - | ||
| 776 | - var yck=0 | ||
| 777 | - let resData = res1.data.data | ||
| 778 | - resData.map(ite => { | ||
| 779 | - yck += ite.advancesum*1 | ||
| 780 | - }) | ||
| 781 | - if(yck<=0){ | ||
| 782 | - getApp().confirmBox("每天每人仅能使用1次预存抵扣"); | ||
| 783 | - th.setData({ paying: 0 }); | ||
| 784 | - return false; | ||
| 785 | - } | ||
| 786 | - | ||
| 787 | - if(order.pre_cut && yck!=order.pre_cut){ | ||
| 788 | - getApp().confirmBox("获取预存的金额不对"); | ||
| 789 | - th.setData({ paying: 0 }); | ||
| 790 | - return false; | ||
| 791 | - } | ||
| 792 | - | ||
| 793 | - | ||
| 794 | - } | ||
| 795 | - | ||
| 796 | - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} | ||
| 797 | - if (parseInt(order_goods['0']['prom_type']) == 9) { | ||
| 798 | - var aid = order_goods['0']['prom_id']; | ||
| 799 | - var knum = 0; | ||
| 800 | - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { | ||
| 801 | - }).then(res => { | ||
| 802 | - if (res.data.code == 0) { | ||
| 803 | - knum = res.data.data; | ||
| 804 | - } | ||
| 805 | - }); | ||
| 806 | - | ||
| 807 | - if (knum <= 0) { | ||
| 808 | - getApp().confirmBox("库存为0，支付失败"); | ||
| 809 | - th.setData({ paying: 0 }); | ||
| 810 | - return false; | ||
| 811 | - } | ||
| 812 | - | ||
| 813 | - } | ||
| 814 | 719 | ||
| 720 | + | ||
| 815 | var wlist = ""; | 721 | var wlist = ""; |
| 816 | var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销 | 722 | var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销 |
| 817 | 723 |