Commits · 5149fe6f7ae671301fe66c56513bf3919f90e84a · order-group-application / order-group · GitLab

10 Nov, 2020 26 commits
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 5149fe6f
```
# Conflicts:
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 10, 2020
  5149fe6f Browse Files
- 农工商 · 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
- fix · d7b670f7
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  d7b670f7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 4f00f812
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  4f00f812 Browse Files
- fix · e6bc4142
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  e6bc4142 Browse Files
- 农工商 · 694e3855
  chongfu.liang committed Nov 10, 2020
  
  694e3855 Browse Files
- 升级 · b53dcb62
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  b53dcb62 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 1d0ef9a2
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  1d0ef9a2 Browse Files
- 通过pay_code查询orderCode · 0173133c
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  0173133c Browse Files
- 农工商 · 4d8e5377
  chongfu.liang committed Nov 10, 2020
  
  4d8e5377 Browse Files
- merge · 1db10d7f
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  1db10d7f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 50f88aa7
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Nov 10, 2020
  50f88aa7 Browse Files
- Add#轮训mq · 3650e845
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  3650e845 Browse Files
- fix: · f2b8cd9a
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  f2b8cd9a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 76cef5db
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  76cef5db Browse Files
- fix: · c179fc6c
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  c179fc6c Browse Files
- 版本号说明 · a0423810
  刘鹏飞 committed Nov 10, 2020
  
  a0423810 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into develop · 432a48db
  刘鹏飞 committed Nov 10, 2020
  
  432a48db Browse Files
- 下单锁定的key设置默认时间 · d6f6a270
  刘鹏飞 committed Nov 10, 2020
  
  d6f6a270 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into develop · e80df8e2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  刘鹏飞 committed Nov 10, 2020
  e80df8e2 Browse Files
- 创建订单添加redis锁，防止重复创建订单 · fdb9daa6
  刘鹏飞 committed Nov 10, 2020
  
  fdb9daa6 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · a6695180
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  a6695180 Browse Files
- fix:del 重复 · 6761b23b
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  6761b23b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into develop · 973ee0e5
  刘鹏飞 committed Nov 10, 2020
  
  973ee0e5 Browse Files
09 Nov, 2020 14 commits
- 记录骑手电话和姓名 · 59a95283
  徐康 committed Nov 10, 2020
  
  59a95283 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' · 446bf581
  徐康 committed Nov 10, 2020
  
  446bf581 Browse Files
- 失败保存为remark · eea14aa7
  徐康 committed Nov 10, 2020
  
  eea14aa7 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
- 混合支付Beta · a2b3a434
  xiaoer.li@freemud.com committed Nov 09, 2020
  
  a2b3a434 Browse Files
- 促销类型转换增加集点活动 · d83c195d
  刘鹏飞 committed Nov 09, 2020
  
  d83c195d Browse Files
- Merge branch 'develop' of… · dd700c49
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  xiaoer.li@freemud.com committed Nov 09, 2020
  dd700c49 Browse Files
- sdk升级 · 311ac264
  chongfu.liang committed Nov 09, 2020
  
  311ac264 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