Commit 104e9025ac7811c7818be78f373225c27785c29b
1 parent
07565417
线下库存的判断优化
Showing
1 changed file
with
6 additions
and
8 deletions
pages/cart/cart/cart.js
@@ -2600,7 +2600,7 @@ Page({ | @@ -2600,7 +2600,7 @@ Page({ | ||
2600 | }, | 2600 | }, |
2601 | 2601 | ||
2602 | //-- 循环汇总其他门店,其他活动有此商品的购买数量的汇总,不包含赠品 -- | 2602 | //-- 循环汇总其他门店,其他活动有此商品的购买数量的汇总,不包含赠品 -- |
2603 | - get_goods_other(item, pitem){ | 2603 | + get_goods_other(item, pitem,only){ |
2604 | var goods_id = this.data.requestData[pitem].goods[item].goods_id; | 2604 | var goods_id = this.data.requestData[pitem].goods[item].goods_id; |
2605 | var num=0; | 2605 | var num=0; |
2606 | for (let i = 0; i < this.data.requestData[pitem].goods.length; i++) { | 2606 | for (let i = 0; i < this.data.requestData[pitem].goods.length; i++) { |
@@ -2609,6 +2609,8 @@ Page({ | @@ -2609,6 +2609,8 @@ Page({ | ||
2609 | num+=t_item.goods_num | 2609 | num+=t_item.goods_num |
2610 | } | 2610 | } |
2611 | } | 2611 | } |
2612 | + | ||
2613 | + if(only) return num; | ||
2612 | for (let j = 0; j < this.data.requestData.length;j++){ | 2614 | for (let j = 0; j < this.data.requestData.length;j++){ |
2613 | if(j!=pitem){ | 2615 | if(j!=pitem){ |
2614 | var goods=this.data.requestData[j].goods; | 2616 | var goods=this.data.requestData[j].goods; |
@@ -2877,16 +2879,16 @@ Page({ | @@ -2877,16 +2879,16 @@ Page({ | ||
2877 | var cQty=store_count; | 2879 | var cQty=store_count; |
2878 | //--- 看一下是不是线下库存 --- | 2880 | //--- 看一下是不是线下库存 --- |
2879 | if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) { | 2881 | if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) { |
2880 | - | ||
2881 | //th.check_down_line(t, pitem, item, wareIds,limit); | 2882 | //th.check_down_line(t, pitem, item, wareIds,limit); |
2882 | var ob = {}; | 2883 | var ob = {}; |
2883 | - await th.check_down_line_next(t, pitem, item, erpwareid, function (res) { | 2884 | + await th.check_down_line_next(t, pitem, item, wareIds, function (res) { |
2884 | ob = res; | 2885 | ob = res; |
2885 | }); | 2886 | }); |
2886 | cQty=ob.CanOutQty; | 2887 | cQty=ob.CanOutQty; |
2888 | + //-- 只获取相同门店,2的时候,因为是线下不同的门店,所以库存再不同门店是不一样的 -- | ||
2889 | + if(th.data.sales_rules== 2) other_gd_num=th.get_goods_other(item, pitem,1); | ||
2887 | } | 2890 | } |
2888 | 2891 | ||
2889 | - | ||
2890 | var is_showing=0; | 2892 | var is_showing=0; |
2891 | var cbuy=limit; | 2893 | var cbuy=limit; |
2892 | if (t.goods_num > limit) { | 2894 | if (t.goods_num > limit) { |
@@ -3379,7 +3381,6 @@ Page({ | @@ -3379,7 +3381,6 @@ Page({ | ||
3379 | 3381 | ||
3380 | //--------------去结算------------ | 3382 | //--------------去结算------------ |
3381 | async checkout() { | 3383 | async checkout() { |
3382 | - | ||
3383 | if (getApp().is_sp_hao()) { | 3384 | if (getApp().is_sp_hao()) { |
3384 | wx.showToast({ | 3385 | wx.showToast({ |
3385 | title: "视频号不支持购物车购买", | 3386 | title: "视频号不支持购物车购买", |
@@ -3615,9 +3616,6 @@ Page({ | @@ -3615,9 +3616,6 @@ Page({ | ||
3615 | return false | 3616 | return false |
3616 | } | 3617 | } |
3617 | 3618 | ||
3618 | - | ||
3619 | - | ||
3620 | - | ||
3621 | if (checkArr7.length > 0) { | 3619 | if (checkArr7.length > 0) { |
3622 | let checkStr = [] | 3620 | let checkStr = [] |
3623 | checkArr7.map(item => { | 3621 | checkArr7.map(item => { |