Commits · aab0657110f539805f7f9c163973e466f5cd785e · jenkins / order-group

30 Mar, 2020 3 commits

Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · aab06571

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-management/order-management.iml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Mar 30, 2020

aab06571 Browse Files

Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · a32b9aac

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-management/order-management.iml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Mar 30, 2020

a32b9aac Browse Files

调整 · 4afe8621
姜海波 committed Mar 30, 2020

4afe8621 Browse Files

27 Mar, 2020 12 commits
- 测试注册 · f0dedf6b
  姜海波 committed Mar 27, 2020
  
  f0dedf6b Browse Files
- 测试注册 · 90c3df96
  姜海波 committed Mar 27, 2020
  
  90c3df96 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into develop · 39d1e838
  dingkai committed Mar 27, 2020
  
  39d1e838 Browse Files
- 升级sdk · 9d7c9428
  dingkai committed Mar 27, 2020
  
  9d7c9428 Browse Files
- 升级sdk · 1915d0a9
  dingkai committed Mar 27, 2020
  
  1915d0a9 Browse Files
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into develop · 7908100c
  dingkai committed Mar 27, 2020
  
  7908100c Browse Files
- 判断优化 · bb0af414
  dingkai committed Mar 27, 2020
  
  bb0af414 Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 57b528d0
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  57b528d0 Browse Files
- 修改assortment-order-sdk依赖delivery-sdk问题 · 88b11cd2
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  88b11cd2 Browse Files
- 合并版本 · f6527e4d
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  f6527e4d Browse Files
- Merge branch 'feature/20200325_oms接单' into develop · 6c921203
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/order-management.iml
```
  shuhu.hou@freemud.cn committed Mar 27, 2020
  6c921203 Browse Files
- orderManager 新增接单接口 · c5a1c9b1
  shuhu.hou@freemud.cn committed Mar 27, 2020
  
  c5a1c9b1 Browse Files
26 Mar, 2020 7 commits
- orderManager一期整理 · 928ba739
  shuhu.hou@freemud.cn committed Mar 26, 2020
  
  928ba739 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · cfb77202
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  cfb77202 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · 7d226603
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  7d226603 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa · abddbcbb
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Mar 26, 2020
  abddbcbb Browse Files
- 调整配送费保存活动号 · 2d05dbc7
  姜海波 committed Mar 26, 2020
  
  2d05dbc7 Browse Files
- 调整配送费小数点 · ee92f0e4
  姜海波 committed Mar 26, 2020
  
  ee92f0e4 Browse Files
- 调整配送费小数点 · c86215f2
  姜海波 committed Mar 26, 2020
  
  c86215f2 Browse Files
25 Mar, 2020 10 commits
- Merge branch 'feature/1.9.17-Exception-20200325-dingkai' into develop · 84581f84
  dingkai committed Mar 25, 2020
  
  84581f84 Browse Files
- 调整配送费小数点 · 2ca0bb30
  姜海波 committed Mar 25, 2020
  
  2ca0bb30 Browse Files
- 日志优化-升级sdk-common-base · 6204a0cb
  dingkai committed Mar 25, 2020
  
  6204a0cb Browse Files
- 调整配送费逻辑 · bc969aca
  姜海波 committed Mar 25, 2020
  
  bc969aca Browse Files
- 调整配送费逻辑 · 00432d0f
  姜海波 committed Mar 25, 2020
  
  00432d0f Browse Files
- 调整配送费逻辑 · 168797c7
  姜海波 committed Mar 25, 2020
  
  168797c7 Browse Files
- 调整配送费逻辑 · 402b6035
  姜海波 committed Mar 25, 2020
  
  402b6035 Browse Files
- 日志优化 · 2db2e258
  dingkai committed Mar 25, 2020
  
  2db2e258 Browse Files
- 调整配送费逻辑 · bd2d8495
  姜海波 committed Mar 25, 2020
  
  bd2d8495 Browse Files
- 调整配送费逻辑 · 241f68b3
  姜海波 committed Mar 25, 2020
  
  241f68b3 Browse Files
24 Mar, 2020 5 commits
- 调整配送费逻辑 · 3bab54d2
  姜海波 committed Mar 24, 2020
  
  3bab54d2 Browse Files
- Merge branch 'feature/20200324_套餐商品组校验' into develop · 606aef6d
```
# Conflicts:
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
```
  shuhu.hou@freemud.cn committed Mar 24, 2020
  606aef6d Browse Files
- 修改校验套餐价格校验逻辑 · 02b311c6
  shuhu.hou@freemud.cn committed Mar 24, 2020
  
  02b311c6 Browse Files
- Merge branch 'feature/20200324_套餐商品组校验' into develop · bb1497c4
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed Mar 24, 2020
  bb1497c4 Browse Files
- 校验套餐添加groupId参数 · f665486a
  shuhu.hou@freemud.cn committed Mar 24, 2020
  
  f665486a Browse Files
23 Mar, 2020 3 commits
- 调整配送费逻辑 · b7465d0f
  姜海波 committed Mar 23, 2020
  
  b7465d0f Browse Files
- 合并代码 · 7457e001
  ping.wu committed Mar 23, 2020
  
  7457e001 Browse Files
- 调整配送费显示 · 1ba8a361
  姜海波 committed Mar 23, 2020
  
  1ba8a361 Browse Files