Commits · 94ec4dd9a45408c66e3cd94181f23c98288e0b7a · jenkins / order-group

26 Feb, 2020 5 commits
- 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 2 commits
- spu sku unit · 8109e09b
  dingkai committed Feb 25, 2020
  
  8109e09b Browse Files
- 商品重量 · 2942d692
  dingkai committed Feb 25, 2020
  
  2942d692 Browse Files
24 Feb, 2020 3 commits
- 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
21 Feb, 2020 2 commits
- Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' into qa · 73b2200e
  huvchao@126.com committed Feb 21, 2020
  
  73b2200e Browse Files
- 创建订单+operator · a4df4c59
  huvchao@126.com committed Feb 21, 2020
  
  a4df4c59 Browse Files
20 Feb, 2020 1 commit

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

19 Feb, 2020 6 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
Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' into qa · 5c16287f
huvchao@126.com committed Feb 19, 2020

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

a77201e2 Browse Files
校验创建配送单参数 · 2a6f13c0
huvchao@126.com committed Feb 19, 2020

2a6f13c0 Browse Files

18 Feb, 2020 11 commits
- Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' into qa · b277fd65
  huvchao@126.com committed Feb 18, 2020
  
  b277fd65 Browse Files
- order-management · 0f05daa6
  huvchao@126.com committed Feb 18, 2020
  
  0f05daa6 Browse Files
- Merge branch 'feature/20200217_无固定搭配套餐' into qa · f8f1e042
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  shuhu.hou committed Feb 18, 2020
  f8f1e042 Browse Files
- 获取均摊传入appId为空时，取会员appId · 24f43556
  shuhu.hou committed Feb 18, 2020
  
  24f43556 Browse Files
- 升级券码sdk版本为release版 · 71162c72
  shuhu.hou committed Feb 18, 2020
  
  71162c72 Browse Files
- 修改购物车goodsType类型判断逻辑 · 9c8ee117
  shuhu.hou committed Feb 18, 2020
  
  9c8ee117 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.11-查询未支付订单-海波' · 5ed75537
  姜海波 committed Feb 18, 2020
  
  5ed75537 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' into qa · e98bf608
  huvchao@126.com committed Feb 18, 2020
  
  e98bf608 Browse Files
- deliverycenter-sdk · b44ca46c
  huvchao@126.com committed Feb 18, 2020
  
  b44ca46c Browse Files
- orderDeliveryQueue · 60ff567f
  huvchao@126.com committed Feb 18, 2020
  
  60ff567f Browse Files
- testOrderDelivery · 843ee1d4
  huvchao@126.com committed Feb 18, 2020
  
  843ee1d4 Browse Files
17 Feb, 2020 1 commit
- add#配送单更新时间 · 2397d23a
  huvchao@126.com committed Feb 18, 2020
  
  2397d23a Browse Files
15 Feb, 2020 1 commit
- 订单配送信息变化时推送到mq · 22d88483
  huvchao@126.com committed Feb 16, 2020
  
  22d88483 Browse Files
14 Feb, 2020 3 commits
- Merge branch 'feature/20200205_券码核销改造' · 1e6efe63
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
```
  shuhu.hou committed Feb 14, 2020
  1e6efe63 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' · 7a15f317
  shuhu.hou committed Feb 14, 2020
  
  7a15f317 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' · ed2e687b
  姜海波 committed Feb 14, 2020
  
  ed2e687b Browse Files
13 Feb, 2020 3 commits
- 1.1.7.RELEASE · 81a5b857
  huvchao@126.com committed Feb 13, 2020
  
  81a5b857 Browse Files
- 解决分支冲突问题 · 7d5fb57b
  shuhu.hou committed Feb 13, 2020
  
  7d5fb57b Browse Files
- # add · bcffcadc
```
order-management
```
  huvchao@126.com committed Feb 13, 2020
  bcffcadc Browse Files
12 Feb, 2020 2 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa · 10ea11a0
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  huvchao@126.com committed Feb 12, 2020
  10ea11a0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa · 3f306e25
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  huvchao@126.com committed Feb 12, 2020
  3f306e25 Browse Files