Commits · f1688feff880102b497d524ecafbc3408463cb4e · jenkins / order-group · GitLab

09 Jan, 2020 3 commits
- Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'qa' of… · f1688fef
```
Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
```
  ping.wu committed Jan 09, 2020
  f1688fef Browse Files
- Merge branch 'feature/20200109_微信订阅消息' into qa · f6e9690f
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  f6e9690f Browse Files
- 微信订阅消息版本升级 · 22bb1769
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  22bb1769 Browse Files
08 Jan, 2020 13 commits
- Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group · c76c89be
  haibo.jiang committed Jan 08, 2020
  
  c76c89be Browse Files
- Merge branch 'feature/1.9.9-购物车接口增加渠道-海波' into develop · 74421aba
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
```
  haibo.jiang committed Jan 08, 2020
  74421aba Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into qa · 58aa1617
  shuhu.hou@freemud.cn committed Jan 08, 2020
  
  58aa1617 Browse Files
- 积分fixbug · a434a955
  shuhu.hou@freemud.cn committed Jan 08, 2020
  
  a434a955 Browse Files
- 升级版本 · af2a61d2
  dingkai committed Jan 08, 2020
  
  af2a61d2 Browse Files
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' · 14f937d0
  dingkai committed Jan 08, 2020
  
  14f937d0 Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into qa · a4534d95
  shuhu.hou@freemud.cn committed Jan 08, 2020
  
  a4534d95 Browse Files
- 门店商品校验，非法商品根据cartGoodsUuid排除 · e9ca7de3
  shuhu.hou@freemud.cn committed Jan 08, 2020
  
  e9ca7de3 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.9-支付有礼增加sku-海波' · f8e9b0e4
  haibo.jiang committed Jan 08, 2020
  
  f8e9b0e4 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.9-购物车接口增加渠道-海波' · 9fb9285d
  haibo.jiang committed Jan 08, 2020
  
  9fb9285d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' · 2e7b1ae7
  胡超 committed Jan 08, 2020
  
  2e7b1ae7 Browse Files
- sessionKey · 52bf1c1e
  胡超 committed Jan 08, 2020
  
  52bf1c1e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' · c513d773
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  胡超 committed Jan 08, 2020
  c513d773 Browse Files
07 Jan, 2020 7 commits
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into qa · 5b4a108f
  dingkai committed Jan 07, 2020
  
  5b4a108f Browse Files
- 删除换行 · 82de7198
  dingkai committed Jan 07, 2020
  
  82de7198 Browse Files
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into qa · 7c27eebf
  dingkai committed Jan 07, 2020
  
  7c27eebf Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into qa · 9811bf31
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  9811bf31 Browse Files
- 升级product-sdk版本 · 90fb352b
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  90fb352b Browse Files
- 围餐商品删除 · f79ef038
  dingkai committed Jan 07, 2020
  
  f79ef038 Browse Files
- 修复结算页商品列表为空时，才提示 · 973445fd
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  973445fd Browse Files
06 Jan, 2020 7 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.9-购物车接口增加渠道-海波' into qa · 1f08c408
  haibo.jiang committed Jan 06, 2020
  
  1f08c408 Browse Files
- Merge branch 'feature/1.9.9-购物车接口增加渠道-海波' into develop · 6067bcb5
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
```
  haibo.jiang committed Jan 06, 2020
  6067bcb5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' into qa · 71268b0e
  胡超 committed Jan 06, 2020
  
  71268b0e Browse Files
- sessionKey · a86d43b0
  胡超 committed Jan 06, 2020
  
  a86d43b0 Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into qa · 9ed46149
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  9ed46149 Browse Files
- 修复addGoods接口，校验bug · 266abba2
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  266abba2 Browse Files
- 修复bug · 8f9b86b6
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  8f9b86b6 Browse Files
03 Jan, 2020 4 commits
- Merge branch 'feature/1.9.9_购物车校验' into qa · 495dcd15
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  495dcd15 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' into qa · 4a37760c
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  胡超 committed Jan 03, 2020
  4a37760c Browse Files
- sessionKey · 6108d218
  胡超 committed Jan 03, 2020
  
  6108d218 Browse Files
- 回滚代码 · d9011769
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  d9011769 Browse Files
02 Jan, 2020 4 commits
- Merge branches 'feature/20191225_扫脸支付_wuping' and 'master' of… · 4368acce
```
Merge branches 'feature/20191225_扫脸支付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jan 02, 2020
  4368acce Browse Files
- 取参修改 · 60cad1bf
  ping.wu committed Jan 02, 2020
  
  60cad1bf Browse Files
- 微信新版订阅消息判断新加返回orderType字段 · e8137115
  ping.wu committed Jan 02, 2020
  
  e8137115 Browse Files
- 优化购物车逻辑 · 140c901d
  shuhu.hou@freemud.cn committed Jan 02, 2020
  
  140c901d Browse Files
31 Dec, 2019 2 commits
- 购物车校验fixbug · 5ee2d2ae
  shuhu.hou@freemud.cn committed Dec 31, 2019
  
  5ee2d2ae Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.9-支付有礼增加sku-海波' into qa · 3395db71
  haibo.jiang committed Dec 31, 2019
  
  3395db71 Browse Files