Commits · a1f919f00f8035669ca760d4220dcb4a1ee8554d · order-group-application / order-group · GitLab

24 Sep, 2020 9 commits
- Merge branch 'feature-yu.sun-20200915-new' · a1f919f0
  孙昱 committed Sep 24, 2020
  
  a1f919f0 Browse Files
- sunyu::update::fix bug about switch store · 28b29250
  孙昱 committed Sep 24, 2020
  
  28b29250 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into bugfix/20200924_修复问题临时分支 · a073bd0d
  徐康 committed Sep 24, 2020
  
  a073bd0d Browse Files
- 套餐类型转换 · 3578d1b9
  徐康 committed Sep 24, 2020
  
  3578d1b9 Browse Files
- Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into bugfix/20200924_修复问题临时分支 · 0a91b9ca
  徐康 committed Sep 24, 2020
  
  0a91b9ca Browse Files
- Merge branch 'feature-yu.sun-20200915-new' of… · 778efb70
```
Merge branch 'feature-yu.sun-20200915-new' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-20200915-new
```
  孙昱 committed Sep 24, 2020
  778efb70 Browse Files
- sunyu::update::fix bug about switch api · 06496a8b
  孙昱 committed Sep 24, 2020
  
  06496a8b Browse Files
- 套餐价格不需要乘以商品数量 · e069217c
  徐康 committed Sep 24, 2020
  
  e069217c Browse Files
- sunyu::update::fix bug about packageAmount · 19f9c1ed
  孙昱 committed Sep 24, 2020
  
  19f9c1ed Browse Files
23 Sep, 2020 5 commits
- sunyu::update::fix bug about copyOrder · 3d48ca3d
  孙昱 committed Sep 23, 2020
  
  3d48ca3d Browse Files
- sunyu::update::fix bug about calculationDiscount · 33b4d667
  孙昱 committed Sep 23, 2020
  
  33b4d667 Browse Files
- 再来一单早餐啡常搭 · 425a1c64
  徐康 committed Sep 23, 2020
  
  425a1c64 Browse Files
- 商家退款后取消发送mq消息，统一放在mq中执行 · 2e0033a3
  zhiheng.zhang committed Sep 23, 2020
  
  2e0033a3 Browse Files
- sunyu::fixbug::fix bug about check reason content for check shoppingcart info · f8d7ee9c
  孙昱 committed Sep 23, 2020
  
  f8d7ee9c Browse Files
22 Sep, 2020 14 commits
- sunyu::update::fix bug about check shoppingcart info · a17acd3d
  孙昱 committed Sep 23, 2020
  
  a17acd3d Browse Files
- sunyu::update::reconstruct code block for checkout shoppingcartInfo · 3bbd58e6
  孙昱 committed Sep 22, 2020
  
  3bbd58e6 Browse Files
- sunyu::update::fix bug about checkShoppingCartINfo · 5727d012
  孙昱 committed Sep 22, 2020
  
  5727d012 Browse Files
- Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' · d999f0de
  vega committed Sep 22, 2020
  
  d999f0de Browse Files
- 餐道价格修复 · 3eb12fab
  徐康 committed Sep 22, 2020
  
  3eb12fab Browse Files
- 早餐啡常搭 · 7795b12e
  徐康 committed Sep 22, 2020
  
  7795b12e Browse Files
- 电子风味卡对特殊返回进行展示 · 871bd97e
  vega committed Sep 22, 2020
  
  871bd97e Browse Files
- 电子风味卡对特殊返回进行展示 · 86bc2ad6
  vega committed Sep 22, 2020
  
  86bc2ad6 Browse Files
- 电子风味卡对特殊返回进行展示 · 646df96d
  vega committed Sep 22, 2020
  
  646df96d Browse Files
- 早餐非常搭 · 2e6ed8b4
  徐康 committed Sep 22, 2020
  
  2e6ed8b4 Browse Files
- 早餐非常搭 · 276614ba
  徐康 committed Sep 22, 2020
  
  276614ba Browse Files
- 修复价格累加 · ec881697
  徐康 committed Sep 22, 2020
  
  ec881697 Browse Files
- sunyu::update::add new field couponCode for getCartInfoByUser api · 4731f5cc
  孙昱 committed Sep 22, 2020
  
  4731f5cc Browse Files
- 购物车商品早餐非常搭 · 4ef51b0d
  徐康 committed Sep 22, 2020
  
  4ef51b0d Browse Files
21 Sep, 2020 8 commits
- sunyu::update::fix bug about toastMsg spell · 6b658405
  孙昱 committed Sep 21, 2020
  
  6b658405 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-6位随机取餐码-张志恒' · 98182759
  zhiheng.zhang committed Sep 21, 2020
  
  98182759 Browse Files
- 删除多余的方法 · e7764675
  zhiheng.zhang committed Sep 21, 2020
  
  e7764675 Browse Files
- 麦咖啡套餐不能合并商品 · 72d496b2
  徐康 committed Sep 21, 2020
  
  72d496b2 Browse Files
- sunyu::update::fix bug about toastMsg spell · 90d06340
  孙昱 committed Sep 21, 2020
  
  90d06340 Browse Files
- Merge branch 'feature/20200914-1.9.39-支付渠道对接生态-肖家炜' · 4b17910b
  vega committed Sep 21, 2020
  
  4b17910b Browse Files
- feat:merge:升级外卖sdk到release · b75e3885
  vega committed Sep 21, 2020
  
  b75e3885 Browse Files
- 早餐随心配套餐名称 · f9b16929
  徐康 committed Sep 21, 2020
  
  f9b16929 Browse Files
20 Sep, 2020 1 commit
- 取餐码返回mealCodeType · 66376df5
  zhiheng.zhang committed Sep 20, 2020
  
  66376df5 Browse Files
19 Sep, 2020 2 commits
- 取餐码更新位置调整 · 92a6db7c
  zhiheng.zhang committed Sep 19, 2020
  
  92a6db7c Browse Files
- 取餐码更新位置调整 · 037696dd
  zhiheng.zhang committed Sep 19, 2020
  
  037696dd Browse Files
18 Sep, 2020 1 commit
- 6位取餐码添加打印日志 · 66ae34f9
  zhiheng.zhang committed Sep 18, 2020
  
  66ae34f9 Browse Files