Commits · 1e1f7b801d65139099642c547da2c57ca0486402 · jenkins / order-group · GitLab

11 Mar, 2020 6 commits
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 1e1f7b80
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 11, 2020
  1e1f7b80 Browse Files
- 外卖单取消配送 · 0e41142d
  ping.wu committed Mar 11, 2020
  
  0e41142d Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · c9b30d8f
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Mar 11, 2020
  c9b30d8f Browse Files
- 预约时间判断修改 · 5c6431d0
  ping.wu committed Mar 11, 2020
  
  5c6431d0 Browse Files
- Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of… · 3e59d74b
```
Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Mar 11, 2020
  3e59d74b Browse Files
- 报错修改 · 531b9d59
  ping.wu committed Mar 11, 2020
  
  531b9d59 Browse Files
10 Mar, 2020 17 commits
- sdk版本修改 · bd999092
  ping.wu committed Mar 10, 2020
  
  bd999092 Browse Files
- 预约单修改 · 49a7bfa5
  ping.wu committed Mar 10, 2020
  
  49a7bfa5 Browse Files
- 隔天预约单调整 · 07ea3939
  ping.wu committed Mar 10, 2020
  
  07ea3939 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 87246edb
  shuhu.hou committed Mar 10, 2020
  
  87246edb Browse Files
- Merge branch 'feature/20200310_微信订单上传金额修复' into develop · 790c18ec
  shuhu.hou committed Mar 10, 2020
  
  790c18ec Browse Files
- 微信订单上传，更改日志方式 · 01027748
  shuhu.hou committed Mar 10, 2020
  
  01027748 Browse Files
- 顾客更改收货地址不取消配送单不取消配送单 · 21bfbf30
  huvchao@126.com committed Mar 10, 2020
  
  21bfbf30 Browse Files
- 顾客更改收货地址不取消配送单不取消配送单 · 18e4f1c5
  huvchao@126.com committed Mar 10, 2020
  
  18e4f1c5 Browse Files
- Merge branch 'feature/20200310_微信订单上传金额修复' into develop · 7d69f09c
  shuhu.hou committed Mar 10, 2020
  
  7d69f09c Browse Files
- 微信订单上传添加日志 · 99f2766e
  shuhu.hou committed Mar 10, 2020
  
  99f2766e Browse Files
- Merge branch 'feature/20200310_微信订单上传金额修复' into develop · f1db4f17
  shuhu.hou committed Mar 10, 2020
  
  f1db4f17 Browse Files
- 合并分支，升级sdk版本为release · af05bf99
  shuhu.hou committed Mar 10, 2020
  
  af05bf99 Browse Files
- Merge branch 'feature/20200310_微信订单上传金额修复' into develop · 7a36ee02
  shuhu.hou committed Mar 10, 2020
  
  7a36ee02 Browse Files
- 合并分支，升级sdk版本为release · 5d91cbeb
  shuhu.hou committed Mar 10, 2020
  
  5d91cbeb Browse Files
- 满额减配送费jar升级 · 04ac795b
  dingkai committed Mar 10, 2020
  
  04ac795b Browse Files
- Merge branch 'feature/1.9.15-20200310-dingkai' into develop · 20deec33
  dingkai committed Mar 10, 2020
  
  20deec33 Browse Files
- 满额减配送费 · e67cb164
  dingkai committed Mar 10, 2020
  
  e67cb164 Browse Files
09 Mar, 2020 11 commits
- 订单计算满额减配送费 · 9884aa5a
  姜海波 committed Mar 09, 2020
  
  9884aa5a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · 2e306a5e
  姜海波 committed Mar 09, 2020
  
  2e306a5e Browse Files
- 订单计算满额减配送费 · 152a0fb3
  姜海波 committed Mar 09, 2020
  
  152a0fb3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · ca873937
  姜海波 committed Mar 09, 2020
  
  ca873937 Browse Files
- 订单计算满额减配送费 · 2c5600b5
  姜海波 committed Mar 09, 2020
  
  2c5600b5 Browse Files
- 购物车接口计算满额减配送费并返回结果 · 001782c0
  姜海波 committed Mar 09, 2020
  
  001782c0 Browse Files
- 顾客更改收货地址不取消配送单 · 2133e9e1
  huvchao@126.com committed Mar 09, 2020
  
  2133e9e1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · c8837bbd
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
```
  姜海波 committed Mar 09, 2020
  c8837bbd Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · fc0fc108
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
```
  姜海波 committed Mar 09, 2020
  fc0fc108 Browse Files
- 购物车接口计算满额减配送费并返回结果 · fb1ec4c5
  姜海波 committed Mar 09, 2020
  
  fb1ec4c5 Browse Files
- 配送单异常并且顾客更改配送地址时不取消配送单 · 5c99a044
  huvchao@126.com committed Mar 09, 2020
  
  5c99a044 Browse Files
04 Mar, 2020 6 commits
- 升级RELEASE版本 · 650a7edc
  ping.wu committed Mar 04, 2020
  
  650a7edc Browse Files
- 升级RELEASE版本 · 103ab1ac
  ping.wu committed Mar 04, 2020
  
  103ab1ac Browse Files
- Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'master' of… · 20079b50
```
Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  ping.wu committed Mar 04, 2020
  20079b50 Browse Files
- 修改报错 · 79c861b1
  ping.wu committed Mar 04, 2020
  
  79c861b1 Browse Files
- 合并分支，升级sdk版本为release · c00da647
  shuhu.hou committed Mar 04, 2020
  
  c00da647 Browse Files
- Merge branch 'feature/20200227_商品起售数量' · 54fb8472
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  shuhu.hou committed Mar 04, 2020
  54fb8472 Browse Files