Commits · e8e6498f92d1a30207a7196d3bcefd1d8bbe236b · order-group-application / order-group

29 Oct, 2020 5 commits
- Merge remote-tracking branch 'origin/develop' into develop · e8e6498f
```
# Conflicts:
#	order-management/pom.xml
```
  chongfu.liang committed Oct 29, 2020
  e8e6498f Browse Files
- Merge branch 'feature/2.0.4-修改支持的订单类型' into develop · 696d12c9
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
```
  chongfu.liang committed Oct 29, 2020
  696d12c9 Browse Files
- 创建配送单支持类型改造 · c4c548c9
  chongfu.liang committed Oct 29, 2020
  
  c4c548c9 Browse Files
- Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into develop · afd4a4d4
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Oct 29, 2020
  afd4a4d4 Browse Files
- 添加接口查询商户所有门店的退款订单数量 · d2edb1b0
  刘鹏飞 committed Oct 29, 2020
  
  d2edb1b0 Browse Files
28 Oct, 2020 29 commits
- 报错修改 · ae8be14e
  ping.wu committed Oct 28, 2020
  
  ae8be14e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 83b633af
  ping.wu committed Oct 28, 2020
  
  83b633af Browse Files
- 报错修改 · 5b48edef
  ping.wu committed Oct 28, 2020
  
  5b48edef Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into develop · 4f5eca05
  徐康 committed Oct 28, 2020
  
  4f5eca05 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into develop · 8fce95b5
  徐康 committed Oct 28, 2020
  
  8fce95b5 Browse Files
- Merge branch 'feature/20201021_万能券展示问题_xukang' into develop · 972e27f0
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Oct 28, 2020
  972e27f0 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 7d9d76bc
  徐康 committed Oct 28, 2020
  
  7d9d76bc Browse Files
- 啡常月享卡 · 125b619c
  徐康 committed Oct 28, 2020
  
  125b619c Browse Files
- 报错修改 · c3f670e6
  ping.wu committed Oct 28, 2020
  
  c3f670e6 Browse Files
- 啡常月享卡 · 4d439421
  徐康 committed Oct 28, 2020
  
  4d439421 Browse Files
- 加料再来一单 · a6a71cda
  徐康 committed Oct 28, 2020
  
  a6a71cda Browse Files
- 报错修改 · b352512c
  ping.wu committed Oct 28, 2020
  
  b352512c Browse Files
- Merge branches 'develop' and 'feature-yu.sun-material-20201030' of… · 92d35a50
```
Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  ping.wu committed Oct 28, 2020
  92d35a50 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 3ae88433
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 28, 2020
  3ae88433 Browse Files
- 麦咖啡加料价格 · 8094ee88
  ping.wu committed Oct 28, 2020
  
  8094ee88 Browse Files
- 促销计算：集点活动 · 04517055
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  04517055 Browse Files
- 加料再来一单 · 88cab690
  徐康 committed Oct 28, 2020
  
  88cab690 Browse Files
- 允许多次申请退款 · ac425553
  徐康 committed Oct 28, 2020
  
  ac425553 Browse Files
- 合并新的算价 · 8a186322
  xiaoer.li@freemud.com committed Oct 28, 2020
  
  8a186322 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' · b6d5a887
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Oct 28, 2020
  b6d5a887 Browse Files
- 升级sdk · f2328bea
  chongfu.liang committed Oct 28, 2020
  
  f2328bea Browse Files
- Merge branch 'feature/2.0.4-集点改造' · 5185742c
  chongfu.liang committed Oct 28, 2020
  
  5185742c Browse Files
- 改造 · a04b1a79
  chongfu.liang committed Oct 28, 2020
  
  a04b1a79 Browse Files
- Merge branch 'feature/2.0.4-集点改造' · e589cd4a
  chongfu.liang committed Oct 28, 2020
  
  e589cd4a Browse Files
- 改造 · 17f2c468
  chongfu.liang committed Oct 28, 2020
  
  17f2c468 Browse Files
- 升级SDK · ba4383de
  chongfu.liang committed Oct 28, 2020
  
  ba4383de Browse Files
- 放时间戳 · 61f4a9de
  chongfu.liang committed Oct 28, 2020
  
  61f4a9de Browse Files
- 订单多次申请退款 · bdbf40c9
  徐康 committed Oct 28, 2020
  
  bdbf40c9 Browse Files
- 创建订单时落库 · faac5644
  chongfu.liang committed Oct 28, 2020
  
  faac5644 Browse Files
27 Oct, 2020 6 commits
- 日志 · a7f62381
  chongfu.liang committed Oct 28, 2020
  
  a7f62381 Browse Files
- 参数改造 · 7da3c3a1
  chongfu.liang committed Oct 28, 2020
  
  7da3c3a1 Browse Files
- 参数改造 · 8725bded
  chongfu.liang committed Oct 28, 2020
  
  8725bded Browse Files
- 参数改造 · dc423b2e
  chongfu.liang committed Oct 28, 2020
  
  dc423b2e Browse Files
- 参数改造 · 95d78360
  chongfu.liang committed Oct 27, 2020
  
  95d78360 Browse Files
- 修改参数 · 8d74cce6
  chongfu.liang committed Oct 27, 2020
  
  8d74cce6 Browse Files