Commits · 874db97a55fcb09e4ca0093f738a3d3bead0f088 · order-group-application / order-group · GitLab

26 Nov, 2020 19 commits
- Merge branch 'feature/20201119-mixue-zhw' of… · 874db97a
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 26, 2020
  874db97a Browse Files
- fix 取消未支付退款 · e149b220
  张洪旺 committed Nov 26, 2020
  
  e149b220 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · b3680fbf
```
 Conflicts:
	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  xiaoer.li@freemud.com committed Nov 26, 2020
  b3680fbf Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 6ae3b28e
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  6ae3b28e Browse Files
- fix · ad92be70
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  ad92be70 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 79dadbeb
  徐康 committed Nov 26, 2020
  
  79dadbeb Browse Files
- 判断非空 · ddebe670
  徐康 committed Nov 26, 2020
  
  ddebe670 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 4fdd271a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  4fdd271a Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 7d9f3c7b
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  7d9f3c7b Browse Files
- 支付金额上报 · 4619fcb7
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  4619fcb7 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 3c527a30
  张洪旺 committed Nov 26, 2020
  
  3c527a30 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · 7494a729
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 26, 2020
  7494a729 Browse Files
- fix 未支付取消状态 · 2f4a6aa6
  张洪旺 committed Nov 26, 2020
  
  2f4a6aa6 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b3acb166
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  b3acb166 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 06961ce3
  徐康 committed Nov 26, 2020
  
  06961ce3 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 781219c1
  徐康 committed Nov 26, 2020
  
  781219c1 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 39b140b3
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  39b140b3 Browse Files
- 纯svc卡支付入混合支付 · cd45b4df
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  cd45b4df Browse Files
- 对接餐道grilling · 8f0166ab
  徐康 committed Nov 26, 2020
  
  8f0166ab Browse Files
25 Nov, 2020 21 commits
- Merge branch 'feature/2020-1104-混合支付' into qa · 6884a45a
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  6884a45a Browse Files
- 纯svc卡支付入混合支付 · 7dde4144
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  7dde4144 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20201110_混合支付退款_张志恒' into qa · 1b931f38
  zhiheng.zhang committed Nov 25, 2020
  
  1b931f38 Browse Files
- 引用对象修改为orderPayItem · 6532105e
  zhiheng.zhang committed Nov 25, 2020
  
  6532105e Browse Files
- 引用对象修改为orderPayItem · 6622a839
  zhiheng.zhang committed Nov 25, 2020
  
  6622a839 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 637cf349
  zhiheng.zhang committed Nov 25, 2020
  
  637cf349 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · e1fe94ff
  zhiheng.zhang committed Nov 25, 2020
  
  e1fe94ff Browse Files
- 引用对象修改为orderPayItem · 182d0fba
  zhiheng.zhang committed Nov 25, 2020
  
  182d0fba Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 52a40474
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  52a40474 Browse Files
- 纯svc卡支付入混合支付 · 151e38c6
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  151e38c6 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · d3c9806a
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  d3c9806a Browse Files
- callback 升级sk · af25ffe0
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  af25ffe0 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 66dbae1f
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  66dbae1f Browse Files
- 混合支付金额上报 · 6dcdbe3f
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  6dcdbe3f Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 422f6d53
  zhiheng.zhang committed Nov 25, 2020
  
  422f6d53 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · a14752d0
  zhiheng.zhang committed Nov 25, 2020
  
  a14752d0 Browse Files
- 删除多余的转换 · 707e1645
  zhiheng.zhang committed Nov 25, 2020
  
  707e1645 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 97e4d55d
  孙昱 committed Nov 25, 2020
  
  97e4d55d Browse Files
- sunyu::update::fix bug about multipleSpec add singleSpec product · 45acdbb8
  孙昱 committed Nov 25, 2020
  
  45acdbb8 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · b67f0944
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  zhiheng.zhang committed Nov 25, 2020
  b67f0944 Browse Files
- 判断混合支付退款条件修改为根据支付详情 · 8aa00e10
  zhiheng.zhang committed Nov 25, 2020
  
  8aa00e10 Browse Files