Commits · 9ae9adb22d0c80c1624af840353e2e90bb134ff9 · order-group-application / order-group · GitLab

17 Aug, 2020 8 commits
- 购物车sdk · 9ae9adb2
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  9ae9adb2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 8a9d2172
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  8a9d2172 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c8f8c053
  zhiheng.zhang committed Aug 17, 2020
  
  c8f8c053 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 82aeca76
  zhiheng.zhang committed Aug 17, 2020
  
  82aeca76 Browse Files
- queryOrderByCode方法添加 · 0a9f40dc
  zhiheng.zhang committed Aug 17, 2020
  
  0a9f40dc Browse Files
- 合并麦咖啡 · 49f5c197
  huiyang.chen committed Aug 17, 2020
  
  49f5c197 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · 10c5218e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/resources/application.properties
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  huiyang.chen committed Aug 17, 2020
  10c5218e Browse Files
- - 小料数量固定传1 · 9151db06
```
- 券码透传金额包含小料
- 均摊*主商品金额
```
  xiaoer.li@freemud.com committed Aug 17, 2020
  9151db06 Browse Files
16 Aug, 2020 6 commits
- pom sdk · 42a095b8
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  42a095b8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · b828373b
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li@freemud.com committed Aug 16, 2020
  b828373b Browse Files
- 小料信息有异常直接从购物车中异常及提示 · 0bd8bba3
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  0bd8bba3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 82870ca4
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  82870ca4 Browse Files
- fix · d35e7312
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  d35e7312 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · a8acc195
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  a8acc195 Browse Files
15 Aug, 2020 7 commits
- 升级购物车sdk 快照 · ff3124a6
  xiaoer.li committed Aug 15, 2020
  
  ff3124a6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 61b4e475
```
# Conflicts:
#	shopping-cart-application-service/pom.xml
```
  xiaoer.li committed Aug 15, 2020
  61b4e475 Browse Files
- 增加小料商品变化异常校验 · 8b79abd5
  xiaoer.li committed Aug 15, 2020
  
  8b79abd5 Browse Files
- 将小料异常标识在行记录上 · a5e0238b
  xiaoer.li committed Aug 15, 2020
  
  a5e0238b Browse Files
- 模拟骑手位置数据 · 3d5b1b74
  huiyang.chen committed Aug 15, 2020
  
  3d5b1b74 Browse Files
- Merge remote-tracking branch 'origin/feature-2020/8/6-McCafe-会阳' into feature-2020/8/6-McCafe-会阳 · acfab53f
  huiyang.chen committed Aug 15, 2020
  
  acfab53f Browse Files
- 模拟骑手位置数据 · 311c5efa
  huiyang.chen committed Aug 15, 2020
  
  311c5efa Browse Files
14 Aug, 2020 19 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 2636298a
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  2636298a Browse Files
- 去掉小料金额累加到主商品上 · 1c4d5058
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  1c4d5058 Browse Files
- 券版删除返回code提示 · 10edb6fd
  zhiheng.zhang committed Aug 14, 2020
  
  10edb6fd Browse Files
- 多活动信息填充 · 02ba30fb
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  02ba30fb Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2478d951
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  2478d951 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 0121166b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  0121166b Browse Files
- 小料价格计入主商品 · fb777dd5
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  fb777dd5 Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · d7baeb52
  chongfu.liang committed Aug 14, 2020
  
  d7baeb52 Browse Files
- 加料价格修改 · a89e2cea
  chongfu.liang committed Aug 14, 2020
  
  a89e2cea Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · d940d419
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  d940d419 Browse Files
- 代金券增加小料数量 · 9cb38155
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  9cb38155 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · ae5c54ef
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  ae5c54ef Browse Files
- 代金券增加小料金额 · 9d16dd1b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  9d16dd1b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · ea00187b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  ea00187b Browse Files
- 代金券增加小料金额 · 216bdeae
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  216bdeae Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 90e86b9f
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  90e86b9f Browse Files
- qa 购物车sdk · cdbca98e
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  cdbca98e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 4eb68c6e
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  4eb68c6e Browse Files
- 代金券增加小料金额 · 4b045e8b
  xiaoer.li@freemud.com committed Aug 14, 2020
  
  4b045e8b Browse Files