Commits · b1007130194f94a2acbe9e51774b8e3a29bb3018 · jenkins / order-group

09 Mar, 2020 2 commits

Merge remote-tracking branch 'remotes/origin/feature/20200309_1.9.1415_TAPD1007005' into develop · b1007130

# 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

b1007130 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
- 合并分支，升级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 qa · 06caa297
  shuhu.hou committed Mar 02, 2020
  
  06caa297 Browse Files
- 动态队列扩充 · d548aaa6
  shuhu.hou committed Mar 02, 2020
  
  d548aaa6 Browse Files
27 Feb, 2020 10 commits
- 修改报错 · b3d2ec9d
  ping.wu committed Feb 27, 2020
  
  b3d2ec9d Browse Files
- Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'qa' of… · 101aa61e
```
Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/pom.xml
```
  ping.wu committed Feb 27, 2020
  101aa61e 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
- 支付宝模板消息升级assortment-data-manager3 · ea901dac
  ping.wu committed Feb 27, 2020
  
  ea901dac Browse Files
- 支付宝模板消息升级assortment-data-manager2 · 60ab554e
  ping.wu committed Feb 27, 2020
  
  60ab554e Browse Files
- 支付宝模板消息升级assortment-data-manager · f6271ff3
  ping.wu committed Feb 27, 2020
  
  f6271ff3 Browse Files
- Merge branch 'feature/20200227_商品起售数量' into qa · b5fd8849
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	shopping-cart-application-service/pom.xml
```
  shuhu.hou committed Feb 27, 2020
  b5fd8849 Browse Files
- 新增、查询购物车接口，响应报文新增起售份数字段riseSell · c5647b37
  shuhu.hou committed Feb 27, 2020
  
  c5647b37 Browse Files
26 Feb, 2020 6 commits
- 支付宝下单支付成功模板消息 · ff56a674
  ping.wu committed Feb 26, 2020
  
  ff56a674 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into qa · 94ec4dd9
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
```
  dingkai committed Feb 26, 2020
  94ec4dd9 Browse Files
- 订单重量 · c52a9808
  dingkai committed Feb 26, 2020
  
  c52a9808 Browse Files
- 订单重量 · 2a6cdb0e
  dingkai committed Feb 26, 2020
  
  2a6cdb0e Browse Files
- jar升级 · 80830f4f
  dingkai committed Feb 26, 2020
  
  80830f4f Browse Files
- 重量计算 · 6f1bafb3
  dingkai committed Feb 26, 2020
  
  6f1bafb3 Browse Files
25 Feb, 2020 10 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
- 普罗米修斯 · 1aa103fa
  姜海波 committed Feb 25, 2020
  
  1aa103fa Browse Files
- spu sku unit · 8109e09b
  dingkai committed Feb 25, 2020
  
  8109e09b Browse Files
- Merge remote-tracking branch 'origin/master' · 4e17b70e
  shuhu.hou committed Feb 25, 2020
  
  4e17b70e Browse Files
- Merge branch 'feature/20200210_微信支付上传' · 573bd297
  shuhu.hou committed Feb 25, 2020
  
  573bd297 Browse Files
- 支付成功上传微信订单 · 0b83fc6a
  shuhu.hou committed Feb 25, 2020
  
  0b83fc6a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-prometheus-海波' · 1a9e83e8
  姜海波 committed Feb 25, 2020
  
  1a9e83e8 Browse Files
- 商品重量 · 2942d692
  dingkai committed Feb 25, 2020
  
  2942d692 Browse Files
24 Feb, 2020 2 commits
- Merge branch 'feature/20200210_微信支付上传' · c2bb8e72
  shuhu.hou committed Feb 24, 2020
  
  c2bb8e72 Browse Files
- 升级订单分发器sdk · 8fbc01f9
  shuhu.hou committed Feb 24, 2020
  
  8fbc01f9 Browse Files