Commit 4cb9163f5037d81f4819e8ed4bcfa908919f3b4d
Merge branch 'dev' into 'test'
fix修复普通购买检测库存问题 See merge request !982
Showing
1 changed file
with
28 additions
and
10 deletions
packageA/pages/cart2_ser/cart2_ser.js
| @@ -477,16 +477,34 @@ Page({ | @@ -477,16 +477,34 @@ Page({ | ||
| 477 | getApp().showWarning("未找到门店"); | 477 | getApp().showWarning("未找到门店"); |
| 478 | return false; | 478 | return false; |
| 479 | } | 479 | } |
| 480 | - var goods = { | ||
| 481 | - 'card_id': gg.service_id, | ||
| 482 | - 'itemid': gg.erpItemID, | ||
| 483 | - 'qty': gg.goods_num, | ||
| 484 | - 'price': gg.money, | ||
| 485 | - 'pickup_id': gg.pick_id, | ||
| 486 | - 'pickup_keyid': list[i].keyid, | ||
| 487 | - 'prom_type': gg.prom_type, //促销活动类型 | ||
| 488 | - 'prom_id': gg.prom_id, //促销活动id | ||
| 489 | - }; | 480 | + |
| 481 | + | ||
| 482 | + if (gg.prom_type == 1 && gg.is_pd_normal == 0) { | ||
| 483 | + // 秒杀活动购买 | ||
| 484 | + var goods = { | ||
| 485 | + 'card_id': gg.service_id, | ||
| 486 | + 'itemid': gg.erpItemID, | ||
| 487 | + 'qty': gg.goods_num, | ||
| 488 | + 'price': gg.money, | ||
| 489 | + 'pickup_id': gg.pick_id, | ||
| 490 | + 'pickup_keyid': list[i].keyid, | ||
| 491 | + 'prom_type': gg.prom_type, //促销活动类型 | ||
| 492 | + 'prom_id': gg.prom_id, //促销活动id | ||
| 493 | + }; | ||
| 494 | + } else { | ||
| 495 | + // 普通购买 | ||
| 496 | + var goods = { | ||
| 497 | + 'card_id': gg.service_id, | ||
| 498 | + 'itemid': gg.erpItemID, | ||
| 499 | + 'qty': gg.goods_num, | ||
| 500 | + 'price': gg.money, | ||
| 501 | + 'pickup_id': gg.pick_id, | ||
| 502 | + 'pickup_keyid': list[i].keyid, | ||
| 503 | + }; | ||
| 504 | + } | ||
| 505 | + | ||
| 506 | + | ||
| 507 | + | ||
| 490 | //--导购分享过来的id-- | 508 | //--导购分享过来的id-- |
| 491 | if (gg.guide_id) { | 509 | if (gg.guide_id) { |
| 492 | goods.guide_id = gg.guide_id; | 510 | goods.guide_id = gg.guide_id; |