Commits · 21bfbf3065a3b47df742065a8abe531b73cab513 · jenkins / order-group · GitLab

10 Mar, 2020 11 commits
- 顾客更改收货地址不取消配送单不取消配送单 · 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 7 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
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' · 0e97e2c0
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
```
  dingkai committed Mar 04, 2020
  0e97e2c0 Browse Files
03 Mar, 2020 1 commit
- 优化查询活动订单 · 3d2aca49
  huvchao@126.com committed Mar 03, 2020
  
  3d2aca49 Browse Files
02 Mar, 2020 3 commits
- 移除创建&支付订单上传微信 · bba68716
  shuhu.hou committed Mar 02, 2020
  
  bba68716 Browse Files
- Merge branch 'feature/20200302_动态队列扩充' into develop · e2be1a72
  shuhu.hou committed Mar 02, 2020
  
  e2be1a72 Browse Files
- 动态队列扩充 · d548aaa6
  shuhu.hou committed Mar 02, 2020
  
  d548aaa6 Browse Files
27 Feb, 2020 7 commits
- Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of… · 9e7f9647
```
Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  ping.wu committed Feb 27, 2020
  9e7f9647 Browse Files
- 模板消息sdk升级 · 7a74eb30
  ping.wu committed Feb 27, 2020
  
  7a74eb30 Browse Files
- OrderExtInfo新增formId · 810648cf
  ping.wu committed Feb 27, 2020
  
  810648cf Browse Files
- OrderExtInfo新增formId · 7744348e
  ping.wu committed Feb 27, 2020
  
  7744348e Browse Files
- Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of… · 86d50d14
```
Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Feb 27, 2020
  86d50d14 Browse Files
- 支付宝模板消息升级assortment-data-manager3 · ea901dac
  ping.wu committed Feb 27, 2020
  
  ea901dac Browse Files
- Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of… · 5d51d21c
```
Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Feb 27, 2020
  5d51d21c Browse Files