Commits · aba50cf0627d178071ba7008d06e09bab3f7fce2 · jenkins / order-group · GitLab

24 Feb, 2020 2 commits
- Merge branch 'feature/20200210_微信支付上传' into develop · aba50cf0
  shuhu.hou committed Feb 24, 2020
  
  aba50cf0 Browse Files
- 升级订单分发器sdk · 8fbc01f9
  shuhu.hou committed Feb 24, 2020
  
  8fbc01f9 Browse Files
18 Feb, 2020 9 commits
- Merge branch 'feature/20200217_无固定搭配套餐' into develop · 26af8c3f
  shuhu.hou committed Feb 18, 2020
  
  26af8c3f Browse Files
- 获取均摊传入appId为空时，取会员appId · 24f43556
  shuhu.hou committed Feb 18, 2020
  
  24f43556 Browse Files
- Merge branch 'feature/20200217_无固定搭配套餐' into develop · 0dd0b500
  shuhu.hou committed Feb 18, 2020
  
  0dd0b500 Browse Files
- 修改购物车goodsType类型判断逻辑 · 9c8ee117
  shuhu.hou committed Feb 18, 2020
  
  9c8ee117 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 822b4f1f
  huvchao@126.com committed Feb 18, 2020
  
  822b4f1f Browse Files
- 开发平台配送信息 · e666e1d1
  huvchao@126.com committed Feb 18, 2020
  
  e666e1d1 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 9 commits
- add#配送单更新时间 · 2397d23a
  huvchao@126.com committed Feb 18, 2020
  
  2397d23a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · 1d3f93c8
  姜海波 committed Feb 17, 2020
  
  1d3f93c8 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · 2d6ae781
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  姜海波 committed Feb 17, 2020
  2d6ae781 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · 2f2dcf48
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  姜海波 committed Feb 17, 2020
  2f2dcf48 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · 7df51c5d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  姜海波 committed Feb 17, 2020
  7df51c5d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · b86fbd53
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  姜海波 committed Feb 17, 2020
  b86fbd53 Browse Files
- 开放平台创建订单 · 58dd0668
  姜海波 committed Feb 17, 2020
  
  58dd0668 Browse Files
- Merge branch 'feature/20200210_微信支付上传' into develop · 362da58c
  shuhu.hou committed Feb 17, 2020
  
  362da58c Browse Files
- 微信订单上传新增订单优惠明细，删除push-order-service · 50316835
  shuhu.hou committed Feb 17, 2020
  
  50316835 Browse Files
15 Feb, 2020 1 commit
- 订单配送信息变化时推送到mq · 22d88483
  huvchao@126.com committed Feb 16, 2020
  
  22d88483 Browse Files
14 Feb, 2020 7 commits
- Merge branch 'feature/20200210_微信支付上传' into develop · 54223a3d
  shuhu.hou committed Feb 14, 2020
  
  54223a3d Browse Files
- 微信订单上传，新增订单创建时间 · 38cdb566
  shuhu.hou committed Feb 14, 2020
  
  38cdb566 Browse Files
- 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/20200210_微信支付上传' into develop · c54c8900
  shuhu.hou committed Feb 14, 2020
  
  c54c8900 Browse Files
- 微信订单上传，订单状态修改 · b14347d1
  shuhu.hou committed Feb 14, 2020
  
  b14347d1 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' · ed2e687b
  姜海波 committed Feb 14, 2020
  
  ed2e687b Browse Files
13 Feb, 2020 2 commits
- 1.1.7.RELEASE · 81a5b857
  huvchao@126.com committed Feb 13, 2020
  
  81a5b857 Browse Files
- # add · bcffcadc
```
order-management
```
  huvchao@126.com committed Feb 13, 2020
  bcffcadc Browse Files
12 Feb, 2020 7 commits
- 查询订单新增orderType字段 · ba974803
  shuhu.hou committed Feb 12, 2020
  
  ba974803 Browse Files
- 查询订单新增orderType字段 · ba6ee830
  shuhu.hou committed Feb 12, 2020
  
  ba6ee830 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 3ce32211
  shuhu.hou committed Feb 12, 2020
  
  3ce32211 Browse Files
- 查询订单新增orderType字段 · 6f3647fa
  shuhu.hou committed Feb 12, 2020
  
  6f3647fa Browse Files
- 未支付订单查询 · 7e9120ff
  姜海波 committed Feb 12, 2020
  
  7e9120ff Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into develop · 2b4828be
  huvchao@126.com committed Feb 12, 2020
  
  2b4828be Browse Files
- productGroupList · 61ab5c96
  huvchao@126.com committed Feb 12, 2020
  
  61ab5c96 Browse Files
11 Feb, 2020 3 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa · fdd839f2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
```
  huvchao@126.com committed Feb 11, 2020
  fdd839f2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa · 8c57992b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
```
  huvchao@126.com committed Feb 11, 2020
  8c57992b Browse Files
- 套餐商品保存商品组信息 · 21428b30
  huvchao@126.com committed Feb 11, 2020
  
  21428b30 Browse Files