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

25 Nov, 2020 38 commits
- 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
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 1eea9426
  孙昱 committed Nov 25, 2020
  
  1eea9426 Browse Files
- sunyu::update::fix bug about multipleSpec add singleSpec product and material · 5bad4a62
  孙昱 committed Nov 25, 2020
  
  5bad4a62 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 3e8318bd
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  3e8318bd Browse Files
- fix:svc混合支付，微信或是支付宝混合支付 · 4c95743d
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  4c95743d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 0d9c8bb4
  孙昱 committed Nov 25, 2020
  
  0d9c8bb4 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6caad351
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  6caad351 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 8877063c
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  8877063c Browse Files
- fix:svc fmId · db5d734f
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  db5d734f Browse Files
- Merge remote-tracking branch 'origin/feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 47d0b445
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  孙昱 committed Nov 25, 2020
  47d0b445 Browse Files
- sunyu::new function::about multipleSpec product add singleSpec product and material · e21da78e
  yu.sun committed Nov 25, 2020
  
  e21da78e Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · ebf39a48
  徐康 committed Nov 25, 2020
  
  ebf39a48 Browse Files
- 对接餐道grilling · eca63bfc
  徐康 committed Nov 25, 2020
  
  eca63bfc Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · ffae90fb
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  ffae90fb Browse Files
- fix:svc fmId · 97c8186c
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  97c8186c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · ae7ab1bb
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  ae7ab1bb Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · bb054722
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  bb054722 Browse Files
- fix:svc fmId · c01e9d62
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  c01e9d62 Browse Files
- 升级sdk · fd68d0a7
  chongfu.liang committed Nov 25, 2020
  
  fd68d0a7 Browse Files
- Merge branch 'feature/20201123-添加美团点评渠道' into qa · 75f2e5db
  chongfu.liang committed Nov 25, 2020
  
  75f2e5db Browse Files
- Merge branch 'feature/20201120-甩手添加事件通知-lcf' into qa · e9744500
  chongfu.liang committed Nov 25, 2020
  
  e9744500 Browse Files
- sdk · 3f9dd300
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  3f9dd300 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · e5051315
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  e5051315 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · c2202787
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  c2202787 Browse Files
- 混合支付优化调整 · 64fffaac
  xiaoer.li@freemud.com committed Nov 25, 2020
  
  64fffaac Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · a4a38103
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 25, 2020
  a4a38103 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · bc62bd0d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
#	ordercenter-sdk/pom.xml
```
  徐康 committed Nov 25, 2020
  bc62bd0d Browse Files
- 对接支付点餐类型 · a2bf9b4e
  徐康 committed Nov 25, 2020
  
  a2bf9b4e Browse Files
24 Nov, 2020 2 commits
- Merge branch 'feature/new-fixbig' into qa · e26d66bb
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  e26d66bb Browse Files
- 删除判断 · fc8de255
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  fc8de255 Browse Files