Commits · bb98d8769d96c407066d96afbb2df697ff1e9cfa · order-group-application / order-group

02 Nov, 2020 2 commits

Merge branch '2020/11/2-商品券bug-huiyang' into qa · bb98d876

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

committed Nov 02, 2020

bb98d876 Browse Files

fix 商品券加购，存在则删除 · c7c4f4e5
huiyang.chen committed Nov 02, 2020

c7c4f4e5 Browse Files

30 Oct, 2020 19 commits
- Merge branch 'feature-yu.sun-couponAvailable' · 7fa1ef62
  yu.sun committed Oct 31, 2020
  
  7fa1ef62 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' · 76b74062
  yu.sun committed Oct 31, 2020
  
  76b74062 Browse Files
- sunyu::new function::about getAvailableCoupon · 02426f4d
  yu.sun committed Oct 31, 2020
  
  02426f4d Browse Files
- 合代码升级sdk · fca7721c
  徐康 committed Oct 30, 2020
  
  fca7721c Browse Files
- Merge branch '2020/10/29-fabu-huiyang' · 8ad0ed2d
  徐康 committed Oct 30, 2020
  
  8ad0ed2d Browse Files
- Merge branch 'feature/20201021_万能券展示问题_xukang' into 2020/10/29-fabu-huiyang · 1746007a
  徐康 committed Oct 30, 2020
  
  1746007a Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into 2020/10/29-fabu-huiyang · 897ad699
  徐康 committed Oct 30, 2020
  
  897ad699 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into 2020/10/29-fabu-huiyang · 1b38dd66
  徐康 committed Oct 30, 2020
  
  1b38dd66 Browse Files
- 合代码 · e88c4d86
  徐康 committed Oct 30, 2020
  
  e88c4d86 Browse Files
- Merge branch '2020/10/29-fabu-huiyang' · 363a6d19
  huiyang.chen committed Oct 30, 2020
  
  363a6d19 Browse Files
- 月卡券展示问题 · 0674509b
  徐康 committed Oct 30, 2020
  
  0674509b Browse Files
- 订单买卡 · ce6d9bb4
  徐康 committed Oct 30, 2020
  
  ce6d9bb4 Browse Files
- fix 随单购优惠提供给券码 · 864d4292
  huiyang.chen committed Oct 30, 2020
  
  864d4292 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · ab37e427
  徐康 committed Oct 30, 2020
  
  ab37e427 Browse Files
- 订单买卡 · 2a31e5df
  徐康 committed Oct 30, 2020
  
  2a31e5df Browse Files
- fix 随单购优惠提供给券码 · 5b67b33e
  huiyang.chen committed Oct 30, 2020
  
  5b67b33e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 7ba4a268
  xiaoer.li@freemud.com committed Oct 30, 2020
  
  7ba4a268 Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · f6b29b7c
  徐康 committed Oct 30, 2020
  
  f6b29b7c Browse Files
- 订单拒单 · 11c1c80b
  徐康 committed Oct 30, 2020
  
  11c1c80b Browse Files
29 Oct, 2020 19 commits
- Merge branch 'feature-yu.sun-material-20201030' into qa · bcb746b3
  yu.sun committed Oct 30, 2020
  
  bcb746b3 Browse Files
- sunyu::fix::fix about clear deliveryAmount · 2567effe
  yu.sun committed Oct 30, 2020
  
  2567effe Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into qa · cca466f8
  yu.sun committed Oct 30, 2020
  
  cca466f8 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 96f501c2
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 30, 2020
  96f501c2 Browse Files
- sunyu::fix::fix bug about SETMEAL_PRODUCT originalPrice sum · f84358b9
  yu.sun committed Oct 30, 2020
  
  f84358b9 Browse Files
- sdk同步 · 036c41c6
  ping.wu committed Oct 29, 2020
  
  036c41c6 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 8a129acd
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  8a129acd Browse Files
- 促销计算加料商品spuid非空 · 29d993da
  ping.wu committed Oct 29, 2020
  
  29d993da Browse Files
- 套餐可选商品spuid赋值 · c01ca5dd
  ping.wu committed Oct 29, 2020
  
  c01ca5dd Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · e2165787
  yu.sun committed Oct 29, 2020
  
  e2165787 Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 3b306630
  yu.sun committed Oct 29, 2020
  
  3b306630 Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · bbdf752d
  yu.sun committed Oct 29, 2020
  
  bbdf752d Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 8eb4085f
  yu.sun committed Oct 29, 2020
  
  8eb4085f Browse Files
- Merge branch 'feature-yu.sun-material-20201030' of… · 13a1533f
```
Merge branch 'feature-yu.sun-material-20201030' of gitlab.freemud.com:order-group-application/order-group into feature-yu.sun-material-20201030
```
  yu.sun committed Oct 29, 2020
  13a1533f Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · d4acd63c
  yu.sun committed Oct 29, 2020
  
  d4acd63c Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into 2020/10/29-fabu-huiyang · d6e507d3
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 29, 2020
  d6e507d3 Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into 2020/10/29-fabu-huiyang · 8a7a2977
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  徐康 committed Oct 29, 2020
  8a7a2977 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 0aa176cf
  yu.sun committed Oct 29, 2020
  
  0aa176cf Browse Files
- sunyu::update::fix bug about specialAttribute copyOrder · 1e589a0f
  yu.sun committed Oct 29, 2020
  
  1e589a0f Browse Files