Commits · 54fb847292e3142a382fea23bec0d9eb77bcec65 · jenkins / order-group

04 Mar, 2020 2 commits

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

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 1 commit
- 移除创建&支付订单上传微信 · bba68716
  shuhu.hou committed Mar 02, 2020
  
  bba68716 Browse Files
27 Feb, 2020 1 commit
- 新增、查询购物车接口，响应报文新增起售份数字段riseSell · c5647b37
  shuhu.hou committed Feb 27, 2020
  
  c5647b37 Browse Files
26 Feb, 2020 4 commits
- 订单重量 · 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 10 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
- 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
- saasmall · 4334c4fd
  dingkai committed Feb 24, 2020
  
  4334c4fd Browse Files
- saasmall · 18bdf431
  dingkai committed Feb 24, 2020
  
  18bdf431 Browse Files
- 固定商品，可选商品重量 · 3dd37957
  dingkai committed Feb 24, 2020
  
  3dd37957 Browse Files
22 Feb, 2020 3 commits
- 版本升级 · e613aabf
  dingkai committed Feb 22, 2020
  
  e613aabf Browse Files
- 版本升级 · 21618d5a
  dingkai committed Feb 22, 2020
  
  21618d5a Browse Files
- Merge branch 'feature/1.9.12-dingkai' · 90465663
  dingkai committed Feb 22, 2020
  
  90465663 Browse Files
21 Feb, 2020 2 commits
- 创建订单+operator · a4df4c59
  huvchao@126.com committed Feb 21, 2020
  
  a4df4c59 Browse Files
- settlementTypes · 2494d085
  huvchao@126.com committed Feb 21, 2020
  
  2494d085 Browse Files
20 Feb, 2020 2 commits

Merge branch 'feature/1.9.13-mall-20200219-dingkai' into feature/1.9.13-dev-20200219-dingkai · f7f2b9f7

# 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/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/OrderServiceImpl.java

committed Feb 20, 2020

f7f2b9f7 Browse Files

Merge branch 'feature/20200217_无固定搭配套餐' · 7c8beb62
shuhu.hou committed Feb 20, 2020

7c8beb62 Browse Files

19 Feb, 2020 4 commits

Merge branch 'feature/mall-20191211-dingkai' into feature/1.9.13-mall-20200219-dingkai · a89fa266

# 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/assortment-shoppingcart-sdk.iml
#	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/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

committed Feb 19, 2020

a89fa266 Browse Files

Merge branch 'feature/20200205_券码核销改造' · 1f44bb62
shuhu.hou committed Feb 19, 2020

1f44bb62 Browse Files
修改券码移除卡包失败发送邮件判断逻辑 · 0fc64eb0
shuhu.hou committed Feb 19, 2020

0fc64eb0 Browse Files
创建配送单信息失败，配送状态更新为配送异常 · a77201e2
huvchao@126.com committed Feb 19, 2020

a77201e2 Browse Files