Commits · 82ee16164bb4e99d796a7c93dff3678abec3fa5f · jenkins / order-group

27 Feb, 2020 2 commits
- 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 12 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
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · ffbe068a
  dingkai committed Feb 25, 2020
  
  ffbe068a 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
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · aac57ecb
  dingkai committed Feb 25, 2020
  
  aac57ecb Browse Files
- 商品重量 · 2942d692
  dingkai committed Feb 25, 2020
  
  2942d692 Browse Files
24 Feb, 2020 15 commits
- Merge remote-tracking branch 'origin/develop' into develop · c1a67f0b
  shuhu.hou committed Feb 24, 2020
  
  c1a67f0b Browse Files
- Merge branch 'feature/20200210_微信支付上传' into develop · aba50cf0
  shuhu.hou committed Feb 24, 2020
  
  aba50cf0 Browse Files
- 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
- Merge remote-tracking branch 'origin/master' · fedc17f6
  shuhu.hou committed Feb 24, 2020
  
  fedc17f6 Browse Files
- Merge branch 'feature/20200210_微信支付上传' · ee1d562d
  shuhu.hou committed Feb 24, 2020
  
  ee1d562d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' · de18b74c
  huvchao@126.com committed Feb 24, 2020
  
  de18b74c Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · ea4ed6cf
```
# Conflicts:
#	order-management/order-management.iml
```
  姜海波 committed Feb 24, 2020
  ea4ed6cf Browse Files
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · f7ea2d84
```
# Conflicts:
#	order-management/order-management.iml
```
  姜海波 committed Feb 24, 2020
  f7ea2d84 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 4d620755
  dingkai committed Feb 24, 2020
  
  4d620755 Browse Files
- saasmall · 4334c4fd
  dingkai committed Feb 24, 2020
  
  4334c4fd Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 64b99a3b
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
```
  dingkai committed Feb 24, 2020
  64b99a3b Browse Files
- saasmall · 18bdf431
  dingkai committed Feb 24, 2020
  
  18bdf431 Browse Files
- Merge branch 'feature/1.9.13-mall-20200219-dingkai' into develop · 8db4bdbd
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java
#	order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
```
  dingkai committed Feb 24, 2020
  8db4bdbd Browse Files
- 固定商品，可选商品重量 · 3dd37957
  dingkai committed Feb 24, 2020
  
  3dd37957 Browse Files