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

10 Nov, 2020 6 commits
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into qa · d5143b5a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 10, 2020
  d5143b5a Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.4-SNAPSHOT · 495c9428
  刘鹏飞 committed Nov 10, 2020
  
  495c9428 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into qa · b5c349a4
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 10, 2020
  b5c349a4 Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.3-SNAPSHOT · de3d5cba
  刘鹏飞 committed Nov 10, 2020
  
  de3d5cba Browse Files
- 下单锁定的key设置默认时间 · d6f6a270
  刘鹏飞 committed Nov 10, 2020
  
  d6f6a270 Browse Files
- 创建订单添加redis锁，防止重复创建订单 · fdb9daa6
  刘鹏飞 committed Nov 10, 2020
  
  fdb9daa6 Browse Files
09 Nov, 2020 26 commits
- 记录骑手电话和姓名 · 59a95283
  徐康 committed Nov 10, 2020
  
  59a95283 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 446bf581
  徐康 committed Nov 10, 2020
  
  446bf581 Browse Files
- 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
- sunyu::update::update assortment-shoppingcart-sdk · 70c9b307
  孙昱 committed Nov 09, 2020
  
  70c9b307 Browse Files
- sunyu::update::update for shopping-cart-sdk version · 15a9def0
  孙昱 committed Nov 09, 2020
  
  15a9def0 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · c7f58676
  孙昱 committed Nov 09, 2020
  
  c7f58676 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-checkCartInfoAboutCoupon-20201105' · a77cc8ac
  孙昱 committed Nov 09, 2020
  
  a77cc8ac Browse Files
- 促销类型转换增加集点活动 · d83c195d
  刘鹏飞 committed Nov 09, 2020
  
  d83c195d Browse Files
- 升级sdk · 1336ba9a
  徐康 committed Nov 09, 2020
  
  1336ba9a Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 2cd5aba6
  徐康 committed Nov 09, 2020
  
  2cd5aba6 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 '2020/11/2-商品券bug-huiyang' · aae2686d
  huiyang.chen committed Nov 09, 2020
  
  aae2686d 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