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

12 Nov, 2020 1 commit
- up:关掉支付回调Test轮训 · e98e14bd
  xiaoer.li@freemud.com committed Nov 12, 2020
  
  e98e14bd Browse Files
11 Nov, 2020 19 commits
- 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 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
- redis · 406ae23c
  chongfu.liang committed Nov 11, 2020
  
  406ae23c Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 704d3484
  chongfu.liang committed Nov 11, 2020
  
  704d3484 Browse Files
- redis · e8322e4e
  chongfu.liang committed Nov 11, 2020
  
  e8322e4e Browse Files
- 农工商 · 6f7c7022
  chongfu.liang committed Nov 11, 2020
  
  6f7c7022 Browse Files
- 农工商 · 59f922c2
  chongfu.liang committed Nov 11, 2020
  
  59f922c2 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · ab7f5d75
  chongfu.liang committed Nov 11, 2020
  
  ab7f5d75 Browse Files
- 农工商 · 0f28d8a3
  chongfu.liang committed Nov 11, 2020
  
  0f28d8a3 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · c2350679
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  c2350679 Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · f5132f7f
  chongfu.liang committed Nov 11, 2020
  
  f5132f7f Browse Files
- 农工商 · de8e5243
  chongfu.liang committed Nov 11, 2020
  
  de8e5243 Browse Files
- 农工商 · 4fa789d7
  chongfu.liang committed Nov 11, 2020
  
  4fa789d7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 4d74b4c6
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  4d74b4c6 Browse Files
- fix:调整支付返回参数 · 151f8b0c
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  151f8b0c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · ed1d38bd
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  ed1d38bd Browse Files
- fix:调整支付返回参数 · 8bcc8834
  xiaoer.li@freemud.com committed Nov 11, 2020
  
  8bcc8834 Browse Files
10 Nov, 2020 20 commits
- fix:调整支付返回参数 · 72b459b7
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  72b459b7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop · 5ef84e17
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  5ef84e17 Browse Files
- fix:调整支付返回参数 · 4e49230a
  xiaoer.li@freemud.com committed Nov 10, 2020
  
  4e49230a Browse Files
- 升级sdk · eed62d70
  chongfu.liang committed Nov 10, 2020
  
  eed62d70 Browse Files
- 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