Commits · 8f4527aa2ffeb4e9fa3c6d59d062d765af8ae43a · jenkins / order-group

24 Feb, 2020 2 commits

Merge branches 'develop' and 'feature/20200221_储值卡查询购物车开关_wuping' of… · 8f4527aa

Merge branches 'develop' and 'feature/20200221_储值卡查询购物车开关_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java

committed Feb 24, 2020

8f4527aa Browse Files

增加储值卡显示标识提示字段 · b9f9bcda
ping.wu committed Feb 24, 2020

b9f9bcda Browse Files

21 Feb, 2020 4 commits
- 升级ordercenter-sdk · d007f4c7
  huvchao@126.com committed Feb 21, 2020
  
  d007f4c7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.12-开放平台创建订单-海波' into develop · cacf26bf
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  姜海波 committed Feb 21, 2020
  cacf26bf Browse Files
- 优化活动订单 · 817b3846
  huvchao@126.com committed Feb 21, 2020
  
  817b3846 Browse Files
- settlementTypes · 2494d085
  huvchao@126.com committed Feb 21, 2020
  
  2494d085 Browse Files
20 Feb, 2020 1 commit
- Merge branch 'feature/20200217_无固定搭配套餐' · 7c8beb62
  shuhu.hou committed Feb 20, 2020
  
  7c8beb62 Browse Files
19 Feb, 2020 5 commits
- 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 develop · cca78375
  huvchao@126.com committed Feb 19, 2020
  
  cca78375 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 13 commits
- Merge remote-tracking branch 'remotes/origin/feature/20200213_1.9.12_delivery' into develop · 714b6e16
  huvchao@126.com committed Feb 18, 2020
  
  714b6e16 Browse Files
- order-management · 0f05daa6
  huvchao@126.com committed Feb 18, 2020
  
  0f05daa6 Browse Files
- 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
- 升级券码sdk版本为release版 · 71162c72
  shuhu.hou committed Feb 18, 2020
  
  71162c72 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 'remotes/origin/feature-2020/2/10-1.9.11-查询未支付订单-海波' · 5ed75537
  姜海波 committed Feb 18, 2020
  
  5ed75537 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 5 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