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

19 Nov, 2020 7 commits
- Merge branch 'feature/2020-1104-混合支付' into develop · baf68f68
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  baf68f68 Browse Files
- Merge branch 'develop' of… · 92b4005f
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

 Conflicts:
	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  92b4005f Browse Files
- add:原先订单支付方式入库 · 96d0648e
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  96d0648e Browse Files
- jar包版本升级 · e3cfaa4e
  zhiheng.zhang committed Nov 19, 2020
  
  e3cfaa4e Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · a45e4c4d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  zhiheng.zhang committed Nov 19, 2020
  a45e4c4d Browse Files
- jar包版本升级 · be18da2e
  zhiheng.zhang committed Nov 19, 2020
  
  be18da2e Browse Files
- fix:标识符 · 4ce278e3
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  4ce278e3 Browse Files
18 Nov, 2020 22 commits
- fix:区分svc 和混合支付方式给客户端响应 · a1180f48
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  a1180f48 Browse Files
- jar包版本升级 · 09518933
  zhiheng.zhang committed Nov 18, 2020
  
  09518933 Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · 30962737
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  30962737 Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · c79a7b83
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c79a7b83 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 4c80373c
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  4c80373c Browse Files
- fix:区分svc 和混合支付方式给客户端响应 · f3d9cd02
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  f3d9cd02 Browse Files
- fix:补充完整信息 · 13ec3ab1
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  13ec3ab1 Browse Files
- 判断非空修改 · ae042973
  zhiheng.zhang committed Nov 18, 2020
  
  ae042973 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · ff3097fa
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  ff3097fa Browse Files
- fix:补充完整信息 · c524c666
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c524c666 Browse Files
- Merge branch 'develop' of /Users/family/project/java/freemudStore/order-group with conflicts. · 13e251e0
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  13e251e0 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 42d2d136
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  42d2d136 Browse Files
- fix:补充完整信息 · 25e60c0b
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  25e60c0b Browse Files
- fix:补充完整信息 · 00ab1772
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  00ab1772 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 42bd5fbe
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  xiaoer.li@freemud.com committed Nov 18, 2020
  42bd5fbe Browse Files
- fix:补充完整信息 · 66105d9e
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  66105d9e Browse Files
- fix:支付结果设置 · e3c767a7
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  e3c767a7 Browse Files
- add · c7bebfcd
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  c7bebfcd Browse Files
- merge · 42961dda
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  42961dda Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 10eb9ecc
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Nov 18, 2020
  10eb9ecc Browse Files
- 调整混合支付流程 · 8875579c
  xiaoer.li@freemud.com committed Nov 18, 2020
  
  8875579c Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · 3ed021c5
  zhiheng.zhang committed Nov 18, 2020
  
  3ed021c5 Browse Files
17 Nov, 2020 4 commits
- ebcode返回参数修改 · 32e91d1e
  zhiheng.zhang committed Nov 17, 2020
  
  32e91d1e Browse Files
- 支付返回对象修改 · 4a30bee0
  zhiheng.zhang committed Nov 17, 2020
  
  4a30bee0 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · 1fac8374
  zhiheng.zhang committed Nov 17, 2020
  
  1fac8374 Browse Files
- 支付返回对象修改 · d7514194
  zhiheng.zhang committed Nov 17, 2020
  
  d7514194 Browse Files
16 Nov, 2020 7 commits
- 退款ebcode参数修改 · 94ebc168
  zhiheng.zhang committed Nov 16, 2020
  
  94ebc168 Browse Files
- qa · 56bd8f8e
  xiaoer.li@freemud.com committed Nov 16, 2020
  
  56bd8f8e Browse Files
- 拒单添加退款 · 86133194
  zhiheng.zhang committed Nov 16, 2020
  
  86133194 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 1cb74828
  徐康 committed Nov 16, 2020
  
  1cb74828 Browse Files
- 升级sdk · 0664c252
  徐康 committed Nov 16, 2020
  
  0664c252 Browse Files
- fuck · 2fcbe42b
  xiaoer.li@freemud.com committed Nov 16, 2020
  
  2fcbe42b Browse Files
- 拒单添加退款 · c73140b3
  zhiheng.zhang committed Nov 16, 2020
  
  c73140b3 Browse Files