Commits · 89f4b26f13066c3bfb38f74848a039828e84c5b5 · order-group-application / order-group · GitLab

05 Aug, 2020 4 commits
- Merge branch '20200805_张志恒_19.33需求开发' into develop · 89f4b26f
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	call-back-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  zhiheng.zhang committed Aug 05, 2020
  89f4b26f Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 1c2f8473
  zhiheng.zhang committed Aug 05, 2020
  
  1c2f8473 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · ec846be5
  xiaoer.li@freemud.com committed Aug 05, 2020
  
  ec846be5 Browse Files
- fix：促销分摊 · 975fba9c
  xiaoer.li@freemud.com committed Aug 05, 2020
  
  975fba9c Browse Files
04 Aug, 2020 12 commits
- ordercenter 版本修改 · 4bf86d71
  zhiheng.zhang committed Aug 04, 2020
  
  4bf86d71 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 952cc13c
  chongfu.liang committed Aug 04, 2020
  
  952cc13c Browse Files
- 加料商品开发 · ceab59d5
  chongfu.liang committed Aug 04, 2020
  
  ceab59d5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · e474519f
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  e474519f Browse Files
- 增加小料数量 · bba6fbd5
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  bba6fbd5 Browse Files
- 升级SDK · 9889fa0e
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  9889fa0e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 634b044c
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 04, 2020
  634b044c Browse Files
- ordercenter 版本修改 · b5e21e00
  zhiheng.zhang committed Aug 04, 2020
  
  b5e21e00 Browse Files
- 回退版本提交 · 5758c612
  zhiheng.zhang committed Aug 04, 2020
  
  5758c612 Browse Files
- MaterialId->spuId 及将小料价格合到主商品行记录上 · 71b0f4bb
  xiaoer.li@freemud.com committed Aug 04, 2020
  
  71b0f4bb Browse Files
- 提交修改文件 · 9ec23080
  zhiheng.zhang committed Aug 04, 2020
  
  9ec23080 Browse Files
- 提交修改文件 · 6a7a14ae
  zhiheng.zhang committed Aug 04, 2020
  
  6a7a14ae Browse Files
03 Aug, 2020 11 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · e138d29d
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 03, 2020
  e138d29d Browse Files
- 促销计算代码优化 · 2b27a2f3
  ping.wu committed Aug 03, 2020
  
  2b27a2f3 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into develop · 19ca47e6
  chongfu.liang committed Aug 03, 2020
  
  19ca47e6 Browse Files
- 加料商品开发 · 8716be4b
  chongfu.liang committed Aug 03, 2020
  
  8716be4b Browse Files
- Merge branch '202007131400' into develop · 7c48f3bb
  zhiheng.zhang committed Aug 03, 2020
  
  7c48f3bb Browse Files
- 添加字段订单类型 · 5742f801
  zhiheng.zhang committed Aug 03, 2020
  
  5742f801 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.29_修复发券时指定门店引起的结算页展示非适用门店券问题' · d3ed036c
  xiaoer.li@freemud.com committed Aug 03, 2020
  
  d3ed036c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 7a319b7e
  xiaoer.li@freemud.com committed Aug 03, 2020
  
  7a319b7e Browse Files
- fix · dacabbca
  xiaoer.li@freemud.com committed Aug 03, 2020
  
  dacabbca Browse Files
- Merge branch 'feature-2020/8/3-1.9.33-会阳' into develop · 912c1c32
  谌会阳 committed Aug 03, 2020
  
  912c1c32 Browse Files
- 外卖和堂食退款设置 · fccce770
  谌会阳 committed Aug 03, 2020
  
  fccce770 Browse Files
02 Aug, 2020 8 commits
- 删除多余的注释 · 92fca449
  zhiheng.zhang committed Aug 02, 2020
  
  92fca449 Browse Files
- 修改java8的处理逻辑 · ab7e394a
  zhiheng.zhang committed Aug 02, 2020
  
  ab7e394a Browse Files
- 修改java8的处理逻辑 · 89af6262
  zhiheng.zhang committed Aug 02, 2020
  
  89af6262 Browse Files
- Merge branch '202007131400' into develop · bcb0e6a1
  zhiheng.zhang committed Aug 02, 2020
  
  bcb0e6a1 Browse Files
- 聚合层取值修改为结算值 · 8da97f39
  zhiheng.zhang committed Aug 02, 2020
  
  8da97f39 Browse Files
- 聚合层取值修改为结算值 · 00061707
  zhiheng.zhang committed Aug 02, 2020
  
  00061707 Browse Files
- Merge remote-tracking branch 'origin/202007131400' into 202007131400 · d455c1f9
  zhiheng.zhang committed Aug 02, 2020
  
  d455c1f9 Browse Files
- 添加自主积分审核不通过接口 · 3b2b6daf
  zhiheng.zhang committed Aug 02, 2020
  
  3b2b6daf Browse Files
01 Aug, 2020 5 commits
- 积分订单暂定8月份之后的 · fe3c7478
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  fe3c7478 Browse Files
- 升级购物车sdk · d4047293
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  d4047293 Browse Files
- 升级购物车sdk · 29d8b0e6
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  29d8b0e6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 72794160
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 01, 2020
  72794160 Browse Files
- fix:originalAmount · 15bc70d9
  xiaoer.li@freemud.com committed Aug 01, 2020
  
  15bc70d9 Browse Files