Commits · 0e6bc7da0b0521caa4a927cdb64905923d28eaf4 · order-group-application / order-group · GitLab

12 Aug, 2020 8 commits
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 0e6bc7da
  zhiheng.zhang committed Aug 12, 2020
  
  0e6bc7da Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 279e6e7a
  zhiheng.zhang committed Aug 12, 2020
  
  279e6e7a Browse Files
- 订单服务配合券码添加商户号 · 92a8c2e2
  zhiheng.zhang committed Aug 12, 2020
  
  92a8c2e2 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · edb397b3
  chongfu.liang committed Aug 12, 2020
  
  edb397b3 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · fddb7ad6
  chongfu.liang committed Aug 12, 2020
  
  fddb7ad6 Browse Files
- C端加料价格计算 · 979cd8c8
  chongfu.liang committed Aug 12, 2020
  
  979cd8c8 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 65cf738f
  zhiheng.zhang committed Aug 12, 2020
  
  65cf738f Browse Files
- 围餐直接核销 · 061118c3
  zhiheng.zhang committed Aug 12, 2020
  
  061118c3 Browse Files
11 Aug, 2020 24 commits
- 券服务版本升级,dev导入麦咖啡的包 · b37f7b25
  zhiheng.zhang committed Aug 11, 2020
  
  b37f7b25 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 95841ee2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  zhiheng.zhang committed Aug 11, 2020
  95841ee2 Browse Files
- 券服务版本升级 · a172fe8b
  zhiheng.zhang committed Aug 11, 2020
  
  a172fe8b Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · b2893a3a
  zhiheng.zhang committed Aug 11, 2020
  
  b2893a3a Browse Files
- Merge branch 'develop' of… · ba2c48e0
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  zhiheng.zhang committed Aug 11, 2020
  ba2c48e0 Browse Files
- 券服务版本升级 · 19186e32
  zhiheng.zhang committed Aug 11, 2020
  
  19186e32 Browse Files
- 临时修改写死支付1分钱测试 · a1c0e25e
  徐康 committed Aug 11, 2020
  
  a1c0e25e Browse Files
- 修复配置 · 8c3b0db0
  徐康 committed Aug 11, 2020
  
  8c3b0db0 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 95d1acc7
  徐康 committed Aug 11, 2020
  
  95d1acc7 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 07e3b545
  徐康 committed Aug 11, 2020
  
  07e3b545 Browse Files
- 创建配送单失败发邮件 · d23941ff
  徐康 committed Aug 11, 2020
  
  d23941ff Browse Files
- 1.3.4券锁定与解锁合并 · d370322e
  zhiheng.zhang committed Aug 11, 2020
  
  d370322e Browse Files
- 优惠券锁定与解锁 · 69a0d96b
  zhiheng.zhang committed Aug 11, 2020
  
  69a0d96b Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 4de69a5b
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  ping.wu committed Aug 11, 2020
  4de69a5b Browse Files
- 税率代码与门店配送费 · cfd1697e
  ping.wu committed Aug 11, 2020
  
  cfd1697e Browse Files
- 券处理feign合并 · 22d01f9e
  徐康 committed Aug 11, 2020
  
  22d01f9e Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 73aa5be7
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
#	order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
```
  徐康 committed Aug 11, 2020
  73aa5be7 Browse Files
- 对接配送 · 2485b18b
  徐康 committed Aug 11, 2020
  
  2485b18b Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 137ec906
  huiyang.chen committed Aug 11, 2020
  
  137ec906 Browse Files
- 添加骑手距离字段 · a461a559
  huiyang.chen committed Aug 11, 2020
  
  a461a559 Browse Files
- assortment-ordercenter-sdk 升版本 · 1376c827
  xiaoer.li@freemud.com committed Aug 11, 2020
  
  1376c827 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 7534a434
  huiyang.chen committed Aug 11, 2020
  
  7534a434 Browse Files
- 入机成功配送确认接口 · 3f596db3
  huiyang.chen committed Aug 11, 2020
  
  3f596db3 Browse Files
- 麦咖啡查询订单列表优化 · 654d25dd
  huiyang.chen committed Aug 11, 2020
  
  654d25dd Browse Files
10 Aug, 2020 8 commits
- Merge remote-tracking branch 'origin/develop' into develop · 2383db62
  huiyang.chen committed Aug 10, 2020
  
  2383db62 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 1f00783a
  huiyang.chen committed Aug 10, 2020
  
  1f00783a Browse Files
- 配送催单 · 75460f0a
  huiyang.chen committed Aug 10, 2020
  
  75460f0a Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 41358dfe
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  ping.wu committed Aug 10, 2020
  41358dfe Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.34-增加订单渠道口碑等' into develop · 418b4173
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  418b4173 Browse Files
- 增加注释 · be41738c
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  be41738c Browse Files
- 商品开票费率与超值加购 · 9e319bbb
  ping.wu committed Aug 10, 2020
  
  9e319bbb Browse Files
- assort-ordercent-sdk OrderSourceType改动升级 · b9bd1343
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  b9bd1343 Browse Files