Commits · 058bcf16b4cda880f4d136f6a85b1cf21a71dc42 · order-group-application / order-group · GitLab

19 Nov, 2020 16 commits
- Merge branch 'feature/2020-1104-混合支付' into qa · 058bcf16
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  zhiheng.zhang committed Nov 19, 2020
  058bcf16 Browse Files
- 提示信息 · 74381499
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  74381499 Browse Files
- add:原先订单支付方式入库 · 96d0648e
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  96d0648e Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · ff5cbd9b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  zhiheng.zhang committed Nov 19, 2020
  ff5cbd9b Browse Files
- jar包版本升级 · be18da2e
  zhiheng.zhang committed Nov 19, 2020
  
  be18da2e Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · d6f4198c
  zhiheng.zhang committed Nov 19, 2020
  
  d6f4198c Browse Files
- jar包版本升级 · ef04b98d
  zhiheng.zhang committed Nov 19, 2020
  
  ef04b98d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · fa2b77e2
  徐康 committed Nov 19, 2020
  
  fa2b77e2 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · c24cad42
  徐康 committed Nov 19, 2020
  
  c24cad42 Browse Files
- 预计送达时间 · 489b1b8f
  徐康 committed Nov 19, 2020
  
  489b1b8f Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 65656977
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  65656977 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 68154088
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  68154088 Browse Files
- fix:标识符 · 4ce278e3
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  4ce278e3 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2d9a75a6
  徐康 committed Nov 19, 2020
  
  2d9a75a6 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · f45c46e9
  徐康 committed Nov 19, 2020
  
  f45c46e9 Browse Files
- 订单完成时间 · e65d790b
  徐康 committed Nov 19, 2020
  
  e65d790b Browse Files
18 Nov, 2020 24 commits
- Merge branch 'feature/2020-1104-混合支付' into qa · 7a1b2900
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  xiaoer.li@freemud.com committed Nov 18, 2020
  7a1b2900 Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · a1180f48
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  a1180f48 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · a2fe3661
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  a2fe3661 Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · 30962737
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  30962737 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 6c9d263b
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  6c9d263b Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · c79a7b83
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c79a7b83 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 4763c2c2
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  4763c2c2 Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · f3d9cd02
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  f3d9cd02 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 04bdb78f
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  04bdb78f Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · dc70c92f
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  dc70c92f Browse Files
- fix:补充完整信息 · 13ec3ab1
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  13ec3ab1 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · a9475819
  zhiheng.zhang committed Nov 18, 2020
  
  a9475819 Browse Files
- 判断非空修改 · ae042973
  zhiheng.zhang committed Nov 18, 2020
  
  ae042973 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 5f234d17
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  5f234d17 Browse Files
- fix:补充完整信息 · c524c666
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c524c666 Browse Files
- 升级SDK · c06e0ca9
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c06e0ca9 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 1b8719da
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  1b8719da Browse Files
- fix:补充完整信息 · 25e60c0b
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  25e60c0b Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 6a29c35b
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  6a29c35b Browse Files
- fix:补充完整信息 · 00ab1772
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  00ab1772 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 1d51c561
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  xiaoer.li@freemud.com committed Nov 18, 2020
  1d51c561 Browse Files
- fix:补充完整信息 · 66105d9e
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  66105d9e Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · f6e51df1
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  f6e51df1 Browse Files
- fix:支付结果设置 · e3c767a7
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  e3c767a7 Browse Files