Commits · f6271ff3baa1162010697a5882aa726884d9e674 · jenkins / order-group · GitLab

27 Feb, 2020 1 commit
- 支付宝模板消息升级assortment-data-manager · f6271ff3
  ping.wu committed Feb 27, 2020
  
  f6271ff3 Browse Files
26 Feb, 2020 1 commit
- 支付宝下单支付成功模板消息 · ff56a674
  ping.wu committed Feb 26, 2020
  
  ff56a674 Browse Files
25 Feb, 2020 8 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 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
24 Feb, 2020 7 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
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 1 commit
- 创建订单+operator · a4df4c59
  huvchao@126.com committed Feb 21, 2020
  
  a4df4c59 Browse Files
20 Feb, 2020 1 commit
- Merge branch 'feature/20200217_无固定搭配套餐' · 7c8beb62
  shuhu.hou committed Feb 20, 2020
  
  7c8beb62 Browse Files
19 Feb, 2020 4 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
- 创建配送单信息失败，配送状态更新为配送异常 · 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 8 commits
- order-management · 0f05daa6
  huvchao@126.com committed Feb 18, 2020
  
  0f05daa6 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
- 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 2 commits
- add#配送单更新时间 · 2397d23a
  huvchao@126.com committed Feb 18, 2020
  
  2397d23a 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 3 commits
- 微信订单上传，新增订单创建时间 · 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