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

09 Nov, 2020 16 commits
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · bcefbe66
  徐康 committed Nov 10, 2020
  
  bcefbe66 Browse Files
- 失败保存为remark · eea14aa7
  徐康 committed Nov 10, 2020
  
  eea14aa7 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 75d652be
  徐康 committed Nov 09, 2020
  
  75d652be Browse Files
- 入机失败保存到remark · a77b5a85
  徐康 committed Nov 09, 2020
  
  a77b5a85 Browse Files
- 集点合并到qa · 0c1dff4a
  刘鹏飞 committed Nov 09, 2020
  
  0c1dff4a Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 22903402
  徐康 committed Nov 09, 2020
  
  22903402 Browse Files
- 入机失败保存到remark · e5de7dbd
  徐康 committed Nov 09, 2020
  
  e5de7dbd Browse Files
- 升级assortment-ordercenter-sdk版本号为2.0.23-SNAPSHOT · 8ae0edb9
  刘鹏飞 committed Nov 09, 2020
  
  8ae0edb9 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 964ebcf8
```
# Conflicts:
#	order-management/pom.xml
```
  徐康 committed Nov 09, 2020
  964ebcf8 Browse Files
- 入机失败原因 · b6213201
  徐康 committed Nov 09, 2020
  
  b6213201 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 53e19e61
  徐康 committed Nov 09, 2020
  
  53e19e61 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 4bf12afb
  徐康 committed Nov 09, 2020
  
  4bf12afb Browse Files
- 入机失败原因 · 130a6402
  徐康 committed Nov 09, 2020
  
  130a6402 Browse Files
- 下单查询购物车增加集点活动返回 · e79a46dd
  刘鹏飞 committed Nov 09, 2020
  
  e79a46dd Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' into qa · fd38e190
  huiyang.chen committed Nov 09, 2020
  
  fd38e190 Browse Files
- fix 商品券,相同商品的处理 · 4f826835
  huiyang.chen committed Nov 09, 2020
  
  4f826835 Browse Files
06 Nov, 2020 8 commits
- Merge branch 'feature-yu.sun-checkCartInfoAboutCoupon-20201105' into qa · 23d8e3d0
  yu.sun committed Nov 06, 2020
  
  23d8e3d0 Browse Files
- sunyu::update::fix bug about couponDisable · 0901ab4b
  yu.sun committed Nov 06, 2020
  
  0901ab4b Browse Files
- Merge branch '2020/11/2-商品券bug-huiyang' into qa · bce67c59
  huiyang.chen committed Nov 06, 2020
  
  bce67c59 Browse Files
- fix 商品券规格信息 · c65bdbde
  huiyang.chen committed Nov 06, 2020
  
  c65bdbde Browse Files
- Merge branch 'feature-yu.sun-checkCartInfoAboutCoupon-20201105' into qa · a4973d0e
  yu.sun committed Nov 06, 2020
  
  a4973d0e Browse Files
- sunyu::update::fix bug about getCouponNameByCode · 289b24c2
  yu.sun committed Nov 06, 2020
  
  289b24c2 Browse Files
- sunyu::update::fix bug about getCouponNameByCode · cc5a6da1
  yu.sun committed Nov 06, 2020
  
  cc5a6da1 Browse Files
- sunyu::update::update about query couponName by coupnCode save to redis · d5c32ce8
  yu.sun committed Nov 06, 2020
  
  d5c32ce8 Browse Files
05 Nov, 2020 7 commits
- Merge remote-tracking branch 'origin/qa' into qa · 4332e63b
  徐康 committed Nov 05, 2020
  
  4332e63b Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 2ed416a3
  徐康 committed Nov 05, 2020
  
  2ed416a3 Browse Files
- 券校验 · 819e070a
  徐康 committed Nov 05, 2020
  
  819e070a Browse Files
- sunyu::update::fix conflicts · abd1757d
  yu.sun committed Nov 05, 2020
  
  abd1757d Browse Files
- sunyu::update::update assortment-shoppingcart-sdk · 3c091dcb
  yu.sun committed Nov 05, 2020
  
  3c091dcb Browse Files
- Merge branch 'feature-yu.sun-checkCartInfoAboutCoupon-20201105' into qa · 1a3bb492
  yu.sun committed Nov 05, 2020
  
  1a3bb492 Browse Files
- sunyu::update::checkout cartInfo about coupon disable · 3bb6eb3f
  yu.sun committed Nov 05, 2020
  
  3bb6eb3f Browse Files
04 Nov, 2020 9 commits
- Merge remote-tracking branch 'origin/qa' into qa · 0f68214a
  徐康 committed Nov 04, 2020
  
  0f68214a Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 75fc8cae
  徐康 committed Nov 04, 2020
  
  75fc8cae Browse Files
- 设置订单完成时间 · d471b8b9
  徐康 committed Nov 04, 2020
  
  d471b8b9 Browse Files
- Revert "fix 新增加料信息" · a85de71a
```
This reverts commit 72c21db0
```
  谌会阳 committed Nov 04, 2020
  a85de71a Browse Files
- Revert "fix 新增加料信息" · fef17012
```
This reverts commit a71aa724
```
  谌会阳 committed Nov 04, 2020
  fef17012 Browse Files
- 升级sdk · 25ae4c32
  徐康 committed Nov 04, 2020
  
  25ae4c32 Browse Files
- 买3赠1升级sdk · cb89a9ca
  徐康 committed Nov 04, 2020
  
  cb89a9ca Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · b92f2827
  徐康 committed Nov 04, 2020
  
  b92f2827 Browse Files
- 麦咖啡自提预约单提前五分钟提醒入机 · 3d060c67
  徐康 committed Nov 04, 2020
  
  3d060c67 Browse Files