Commits · 1376c827dca2e0a482e9ff12f19414a32c9ea5d9 · order-group-application / order-group · GitLab

11 Aug, 2020 4 commits
- 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 13 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
- Merge remote-tracking branch 'remotes/origin/feature/1.9.34-增加订单渠道口碑等' into develop · c2ffaf17
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  c2ffaf17 Browse Files
- 升级sdk 去掉加料累计 · 109f517f
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  109f517f Browse Files
- 升级sdk 去掉加料累计 · 60e33512
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  60e33512 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · e0965920
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  e0965920 Browse Files
- 小料价格和成交价分开显示 · f13fc5fb
  xiaoer.li@freemud.com committed Aug 10, 2020
  
  f13fc5fb Browse Files
09 Aug, 2020 23 commits
- fix · d05abeb9
  xiaoer.li committed Aug 09, 2020
  
  d05abeb9 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 7963887f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
```
  shuhu.hou@freemud.cn committed Aug 09, 2020
  7963887f Browse Files
- Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳 · a25cba8d
  shuhu.hou@freemud.cn committed Aug 09, 2020
  
  a25cba8d Browse Files
- 配送回调调试 · 145ceda1
  shuhu.hou@freemud.cn committed Aug 09, 2020
  
  145ceda1 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · 7af7e135
  huiyang.chen committed Aug 09, 2020
  
  7af7e135 Browse Files
- candao · 168e5b66
  huiyang.chen committed Aug 09, 2020
  
  168e5b66 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · fc29e678
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 09, 2020
  fc29e678 Browse Files
- 套餐优惠计算 · adecb2eb
  ping.wu committed Aug 09, 2020
  
  adecb2eb Browse Files
- 门店sdk · f8412e1f
  huiyang.chen committed Aug 09, 2020
  
  f8412e1f Browse Files
- 升级sdk · 6e98cdd8
  huiyang.chen committed Aug 09, 2020
  
  6e98cdd8 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · e6742758
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application.properties
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  huiyang.chen committed Aug 09, 2020
  e6742758 Browse Files
- Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳 · b6cb897a
  huiyang.chen committed Aug 09, 2020
  
  b6cb897a Browse Files
- 修改券码地址 · c257a971
  huiyang.chen committed Aug 09, 2020
  
  c257a971 Browse Files
- 券码地址修改为不可用 · dd425127
  huiyang.chen committed Aug 09, 2020
  
  dd425127 Browse Files
- 更改目录结构 · 08aeb701
  shuhu.hou@freemud.cn committed Aug 09, 2020
  
  08aeb701 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into develop · f6a268dc
  huiyang.chen committed Aug 09, 2020
  
  f6a268dc Browse Files
- 加料均摊 · f852f9a9
  xiaoer.li committed Aug 09, 2020
  
  f852f9a9 Browse Files
- 配送地址 · cb8afa57
  huiyang.chen committed Aug 09, 2020
  
  cb8afa57 Browse Files
- 合并冲突修改 · 3ed4fbaa
  ping.wu committed Aug 09, 2020
  
  3ed4fbaa Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 470138cf
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
```
  ping.wu committed Aug 09, 2020
  470138cf Browse Files
- 套餐优惠计算 · d99cc04a
  ping.wu committed Aug 09, 2020
  
  d99cc04a Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · d5512886
  chongfu.liang committed Aug 09, 2020
  
  d5512886 Browse Files
- 区分行号 · b6b77dff
  chongfu.liang committed Aug 09, 2020
  
  b6b77dff Browse Files