Commits · c8837bbda71ddfa251b4e6474d3ccaed70b45d99 · jenkins / order-group

09 Mar, 2020 3 commits

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

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 12 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
- 支付宝模板消息升级assortment-data-manager2 · 60ab554e
  ping.wu committed Feb 27, 2020
  
  60ab554e Browse Files
- Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of… · b6c37dd5
```
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
  b6c37dd5 Browse Files
- 支付宝模板消息升级assortment-data-manager · f6271ff3
  ping.wu committed Feb 27, 2020
  
  f6271ff3 Browse Files
- Merge branch 'feature/20200227_商品起售数量' into develop · 82ee1616
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
```
  shuhu.hou committed Feb 27, 2020
  82ee1616 Browse Files
- 新增、查询购物车接口，响应报文新增起售份数字段riseSell · c5647b37
  shuhu.hou committed Feb 27, 2020
  
  c5647b37 Browse Files
26 Feb, 2020 11 commits
- Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of… · f6ca64c8
```
Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  ping.wu committed Feb 26, 2020
  f6ca64c8 Browse Files
- 支付宝下单支付成功模板消息 · ff56a674
  ping.wu committed Feb 26, 2020
  
  ff56a674 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 68df8cb8
  dingkai committed Feb 26, 2020
  
  68df8cb8 Browse Files
- 订单重量 · c52a9808
  dingkai committed Feb 26, 2020
  
  c52a9808 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 8ecc9d3a
  dingkai committed Feb 26, 2020
  
  8ecc9d3a Browse Files
- 订单重量 · 2a6cdb0e
  dingkai committed Feb 26, 2020
  
  2a6cdb0e Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 14f7df3f
```
# Conflicts:
#	order-application-service/pom.xml
```
  dingkai committed Feb 26, 2020
  14f7df3f Browse Files
- jar升级 · 80830f4f
  dingkai committed Feb 26, 2020
  
  80830f4f Browse Files
- 版本升级 · 01f9e3c7
  dingkai committed Feb 26, 2020
  
  01f9e3c7 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · ad29e10c
  dingkai committed Feb 26, 2020
  
  ad29e10c Browse Files
- 重量计算 · 6f1bafb3
  dingkai committed Feb 26, 2020
  
  6f1bafb3 Browse Files
25 Feb, 2020 3 commits
- 普罗米修斯 · ebaf2f27
  姜海波 committed Feb 25, 2020
  
  ebaf2f27 Browse Files
- 普罗米修斯 · f324378c
  姜海波 committed Feb 25, 2020
  
  f324378c Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · d456b1c6
  姜海波 committed Feb 25, 2020
  
  d456b1c6 Browse Files