Commits · 154e98a1ca28e01de3bf01e2f0a09ebab02dad8f · order-group-application / order-group · GitLab

27 Nov, 2020 15 commits
- Merge branch 'feature/20201110_混合支付退款_张志恒' into qa · 154e98a1
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  zhiheng.zhang committed Nov 27, 2020
  154e98a1 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · a28806bb
  刘鹏飞 committed Nov 27, 2020
  
  a28806bb Browse Files
- 促销返回去掉sendCoupons字段 · bf1894dc
  刘鹏飞 committed Nov 27, 2020
  
  bf1894dc Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · e4a9037b
  孙昱 committed Nov 27, 2020
  
  e4a9037b Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 6ebea935
  孙昱 committed Nov 27, 2020
  
  6ebea935 Browse Files
- sunyu::fix bug::fix bug about materialOriginalPrice is null to createOrder · db300e8d
  孙昱 committed Nov 27, 2020
  
  db300e8d Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · 836f3f5c
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 27, 2020
  836f3f5c Browse Files
- fix 未支付取消状态 · 011f748a
  张洪旺 committed Nov 27, 2020
  
  011f748a Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 3d995e68
  徐康 committed Nov 27, 2020
  
  3d995e68 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b16d71ed
  刘鹏飞 committed Nov 27, 2020
  
  b16d71ed Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c43493b8
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Nov 27, 2020
  c43493b8 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · e175e832
  孙昱 committed Nov 27, 2020
  
  e175e832 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of… · 4255614d
```
Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of gitlab.freemud.com:order-group-application/order-group into feature/20201125_多规格商品下添加单规格商品_yu.sun
```
  孙昱 committed Nov 27, 2020
  4255614d Browse Files
- sunyu::update::fix bug about delivery-fee payment · 27f9b6f0
  孙昱 committed Nov 27, 2020
  
  27f9b6f0 Browse Files
- PayVoucher可能为空 · 01e3fa51
  徐康 committed Nov 27, 2020
  
  01e3fa51 Browse Files
26 Nov, 2020 25 commits
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 7d6d96b9
  yu.sun committed Nov 27, 2020
  
  7d6d96b9 Browse Files
- sunyu::update::fix bug about material about originPrice · 51c1df6a
  yu.sun committed Nov 26, 2020
  
  51c1df6a Browse Files
- 引用对象修改为orderPayItem · 934ca1b4
  zhiheng.zhang committed Nov 26, 2020
  
  934ca1b4 Browse Files
- Merge remote-tracking branch 'origin/feature/20201110_混合支付退款_张志恒' into feature/20201110_混合支付退款_张志恒 · 16ed77d3
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  zhiheng.zhang committed Nov 26, 2020
  16ed77d3 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 07fb68ac
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  07fb68ac Browse Files
- Merge branch 'feature/new-fixbig' into qa · 9bb7057b
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  9bb7057b Browse Files
- 购物车查询增加买一赠一寄杯活动 · f33d6f7e
  刘鹏飞 committed Nov 26, 2020
  
  f33d6f7e Browse Files
- 删除不符合条件的套餐 · 3a00db69
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  3a00db69 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of… · cf3a5503
```
Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Nov 26, 2020
  cf3a5503 Browse Files
- fix var1.setCreateEvent(4); · 69795c3b
  张洪旺 committed Nov 26, 2020
  
  69795c3b Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 8c80dd19
  yu.sun committed Nov 26, 2020
  
  8c80dd19 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 19144c52
  yu.sun committed Nov 26, 2020
  
  19144c52 Browse Files
- sunyu::fixbug::fix bug about material · f07cd9f5
  yu.sun committed Nov 26, 2020
  
  f07cd9f5 Browse Files
- sdk · 7d469fd1
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  7d469fd1 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 532f8498
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  532f8498 Browse Files
- 套餐商品增加商品类型 · 472253db
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  472253db Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · b70a92e4
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  b70a92e4 Browse Files
- fix · 80914e08
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  80914e08 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · cac3048e
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  cac3048e Browse Files
- fix · a9b49734
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  a9b49734 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 788dd9a0
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  788dd9a0 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 1ca427ae
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  1ca427ae Browse Files
- Merge branch 'feature/2020-1104-混合支付' into qa · 2bb7fde0
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  2bb7fde0 Browse Files
- fix · 40a5c97a
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  40a5c97a Browse Files
- fix · 42c5e571
  xiaoer.li@freemud.com committed Nov 26, 2020
  
  42c5e571 Browse Files