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

11 Nov, 2020 6 commits
- Merge branch 'feature/2.0.6-农工商商品兑换券' into qa · a617508b
```
# Conflicts:
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 11, 2020
  a617508b Browse Files
- 农工商 · b214030f
  chongfu.liang committed Nov 11, 2020
  
  b214030f Browse Files
- redis · e8322e4e
  chongfu.liang committed Nov 11, 2020
  
  e8322e4e Browse Files
- 农工商 · 6f7c7022
  chongfu.liang committed Nov 11, 2020
  
  6f7c7022 Browse Files
- 农工商 · de8e5243
  chongfu.liang committed Nov 11, 2020
  
  de8e5243 Browse Files
- 农工商 · 4fa789d7
  chongfu.liang committed Nov 11, 2020
  
  4fa789d7 Browse Files
10 Nov, 2020 15 commits
- 农工商 · 7b077a79
  chongfu.liang committed Nov 10, 2020
  
  7b077a79 Browse Files
- 农工商 · 841acddc
  chongfu.liang committed Nov 10, 2020
  
  841acddc Browse Files
- 农工商 · c4ddae73
  chongfu.liang committed Nov 10, 2020
  
  c4ddae73 Browse Files
- 农工商 · 694e3855
  chongfu.liang committed Nov 10, 2020
  
  694e3855 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 4cb7af02
  徐康 committed Nov 10, 2020
  
  4cb7af02 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · f1185017
  徐康 committed Nov 10, 2020
  
  f1185017 Browse Files
- 外卖单入机失败不限制订单必须是下单状态 · 16df9408
  徐康 committed Nov 10, 2020
  
  16df9408 Browse Files
- key先注销 · f4179ac6
  刘鹏飞 committed Nov 10, 2020
  
  f4179ac6 Browse Files
- 农工商 · 4d8e5377
  chongfu.liang committed Nov 10, 2020
  
  4d8e5377 Browse Files
- 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 19 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
- 农工商卖券 · cbccda8a
  chongfu.liang committed Nov 09, 2020
  
  cbccda8a 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
- 添加农工商卖券 · d4b4fc33
  chongfu.liang committed Nov 09, 2020
  
  d4b4fc33 Browse Files
- 升级assortment-ordercenter-sdk版本号为2.0.23-SNAPSHOT · 8ae0edb9
  刘鹏飞 committed Nov 09, 2020
  
  8ae0edb9 Browse Files