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

20 Nov, 2020 7 commits
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · c0aad8c1
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  zhiheng.zhang committed Nov 20, 2020
  c0aad8c1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 92960e20
  zhiheng.zhang committed Nov 20, 2020
  
  92960e20 Browse Files
- sdk添加取餐码 · 1797707f
  zhiheng.zhang committed Nov 20, 2020
  
  1797707f Browse Files
- oms退款金额修改日志打印修改 · f9ec2687
  zhiheng.zhang committed Nov 20, 2020
  
  f9ec2687 Browse Files
- oms退款金额修改 · fc91c25d
  zhiheng.zhang committed Nov 20, 2020
  
  fc91c25d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0.1-collageOrder-刘鹏飞' into develop · cd22e516
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 20, 2020
  cd22e516 Browse Files
- svc卡支付拼单购物车查询 · c691b31e
  刘鹏飞 committed Nov 20, 2020
  
  c691b31e Browse Files
19 Nov, 2020 19 commits
- 修改包装费 · f4185ad6
  刘鹏飞 committed Nov 19, 2020
  
  f4185ad6 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 0ad9d806
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
```
  zhiheng.zhang committed Nov 19, 2020
  0ad9d806 Browse Files
- 重新调整购物车svc卡计算逻辑 · df2dcc00
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  df2dcc00 Browse Files
- 提示信息 · 74381499
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  74381499 Browse Files
- assortment-order-center-sdk 升级2.2.4 · d4f0eb84
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  d4f0eb84 Browse Files
- Merge branch 'develop' of… · 4e66b3e3
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  4e66b3e3 Browse Files
- assortment-ordercenter-sdk升级为2.2.3-SNAPSHOT · 473a2957
  刘鹏飞 committed Nov 19, 2020
  
  473a2957 Browse Files
- 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 remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into develop · b020010b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 19, 2020
  b020010b Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · 8f79b24d
  刘鹏飞 committed Nov 19, 2020
  
  8f79b24d Browse Files
- Merge remote-tracking branch 'origin/feature/gatherSpot-刘鹏飞' into feature/gatherSpot-刘鹏飞 · 3397ebb8
  刘鹏飞 committed Nov 19, 2020
  
  3397ebb8 Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · b601fcc6
  刘鹏飞 committed Nov 19, 2020
  
  b601fcc6 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
- 拼单购物车改造 · 9dc58a30
  刘鹏飞 committed Nov 19, 2020
  
  9dc58a30 Browse Files
18 Nov, 2020 14 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