Commits · 5f031f9a5cdcbb04e3fed9d0f017f2bbabf1cb6d · order-group-application / order-group · GitLab

12 Nov, 2020 24 commits
- Merge remote-tracking branch 'origin/develop' into develop · 5f031f9a
  chongfu.liang committed Nov 12, 2020
  
  5f031f9a Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · c3982ad2
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  chongfu.liang committed Nov 12, 2020
  c3982ad2 Browse Files
- 修改key · 83e715ce
  chongfu.liang committed Nov 12, 2020
  
  83e715ce Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop · 480df441
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 12, 2020
  480df441 Browse Files
- setAfterSalesOrderTimeOutTask如果配置为空返回null · c4be9dca
  刘鹏飞 committed Nov 12, 2020
  
  c4be9dca Browse Files
- 去掉注释 · 75b6f05d
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  75b6f05d Browse Files
- Merge branch 'feature/2.0.5-储值卡支持推配送费' · 06caa08c
  chongfu.liang committed Nov 12, 2020
  
  06caa08c Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · fa28d816
  zhiheng.zhang committed Nov 12, 2020
  
  fa28d816 Browse Files
- 结局类型冲突 · 5b6b85fc
  zhiheng.zhang committed Nov 12, 2020
  
  5b6b85fc Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · f2a845a7
  zhiheng.zhang committed Nov 12, 2020
  
  f2a845a7 Browse Files
- 修改返回名字 · 24cb6642
  zhiheng.zhang committed Nov 12, 2020
  
  24cb6642 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · db895699
  zhiheng.zhang committed Nov 12, 2020
  
  db895699 Browse Files
- 同意退款添加工具类 · b4b5a739
  zhiheng.zhang committed Nov 12, 2020
  
  b4b5a739 Browse Files
- 下单err更新 · 5adc8e8e
  刘鹏飞 committed Nov 12, 2020
  
  5adc8e8e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 8f143cab
  zhiheng.zhang committed Nov 12, 2020
  
  8f143cab Browse Files
- 同意退款添加工具类 · b43a848b
  zhiheng.zhang committed Nov 12, 2020
  
  b43a848b Browse Files
- up:关掉支付回调Test轮训 · f0d15b76
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  f0d15b76 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 235e81e8
  chongfu.liang committed Nov 12, 2020
  
  235e81e8 Browse Files
- 注册 · 16b9f042
  chongfu.liang committed Nov 12, 2020
  
  16b9f042 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 9bc35aab
  zhiheng.zhang committed Nov 12, 2020
  
  9bc35aab Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · ac662dbe
  zhiheng.zhang committed Nov 12, 2020
  
  ac662dbe Browse Files
- 同意退款添加工具类 · d2dc97eb
  zhiheng.zhang committed Nov 12, 2020
  
  d2dc97eb Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 5f5ee359
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  5f5ee359 Browse Files
- up:关掉支付回调Test轮训 · e98e14bd
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  e98e14bd Browse Files
11 Nov, 2020 16 commits
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · 5c63e07d
```
jar版本号修复

See merge request !10
```
  缪晖 committed Nov 11, 2020
  5c63e07d Browse Files
- jar版本号修复 · 23adfb6f
  缪晖 committed Nov 11, 2020
  
  23adfb6f Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · efb088ca
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  zhiheng.zhang committed Nov 11, 2020
  efb088ca Browse Files
- 退款返回transId映射orderCode · 415d1ab6
  zhiheng.zhang committed Nov 11, 2020
  
  415d1ab6 Browse Files
- 调用支付接口修改 · 96767b5f
  zhiheng.zhang committed Nov 11, 2020
  
  96767b5f Browse Files
- 农工商 · b214030f
  chongfu.liang committed Nov 11, 2020
  
  b214030f Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · fdac3748
```
master分支sdk版本升级

See merge request !9
```
  缪晖 committed Nov 11, 2020
  fdac3748 Browse Files
- master分支sdk版本升级 · 2b4c4047
  缪晖 committed Nov 11, 2020
  
  2b4c4047 Browse Files
- 调用支付接口修改 · db9c83dd
  zhiheng.zhang committed Nov 11, 2020
  
  db9c83dd Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · d0b9a2d5
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  d0b9a2d5 Browse Files
- add#交易序列号和订单号对照 · f319bb01
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  f319bb01 Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'master' · 8a2c3f68
```
Feature/2.0.5【id1018638】【c端服务端】活动库存接口调整对接

See merge request !8
```
  缪晖 committed Nov 11, 2020
  8a2c3f68 Browse Files
- 预发布环境活动sdk版本升级至2.7.RELEASE · 3f38b0e7
  缪晖 committed Nov 11, 2020
  
  3f38b0e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · fefafea3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Nov 11, 2020
  fefafea3 Browse Files
- add#交易序列号和订单号对照 · 308b1011
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  308b1011 Browse Files
- 调用支付接口修改 · 0f4388ad
  zhiheng.zhang committed Nov 11, 2020
  
  0f4388ad Browse Files