Commits · 9675e3a37d0b4262d6c3fe064c23bfe591cf3613 · jenkins / order-group · GitLab

14 Jan, 2020 1 commit
- 若商品详情赋值有异常，直接移除购物车 · 9675e3a3
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  9675e3a3 Browse Files
13 Jan, 2020 5 commits
- 校验门店菜单，也传入商品券商品 · dd8a026b
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  dd8a026b Browse Files
- 合并分支，解决channelType问题 · b6bf39ae
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  b6bf39ae Browse Files
- Merge branch 'master' into feature/1.9.9_购物车校验 · 8bbb24ca
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
```
  shuhu.hou@freemud.cn committed Jan 13, 2020
  8bbb24ca Browse Files
- 1.1.3.RELEASE · 25b26079
  胡超 committed Jan 13, 2020
  
  25b26079 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20200102_1.9.10_thirdCateId' · e3588b84
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  胡超 committed Jan 13, 2020
  e3588b84 Browse Files
10 Jan, 2020 2 commits
- 增加对象判空 · d5b60d47
  姜海波 committed Jan 10, 2020
  
  d5b60d47 Browse Files
- 增加BusinessType · 25855208
  姜海波 committed Jan 10, 2020
  
  25855208 Browse Files
09 Jan, 2020 2 commits
- 微信消息sdk升级 · c31005a7
  ping.wu committed Jan 09, 2020
  
  c31005a7 Browse Files
- 微信订阅消息版本升级 · 22bb1769
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  22bb1769 Browse Files
08 Jan, 2020 11 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
- 积分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
- 门店商品校验，非法商品根据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 4 commits
- 删除换行 · 82de7198
  dingkai committed Jan 07, 2020
  
  82de7198 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 3 commits
- 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
- sessionKey · a86d43b0
  胡超 committed Jan 06, 2020
  
  a86d43b0 Browse Files
- 修复addGoods接口，校验bug · 266abba2
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  266abba2 Browse Files
03 Jan, 2020 2 commits
- sessionKey · 6108d218
  胡超 committed Jan 03, 2020
  
  6108d218 Browse Files
- 回滚代码 · d9011769
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  d9011769 Browse Files
02 Jan, 2020 3 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
- 第三方商品分类编号 · 18a05e9f
  胡超 committed Jan 02, 2020
  
  18a05e9f 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
- 购物车校验fixbug · 2c1b33c4
  shuhu.hou@freemud.cn committed Dec 31, 2019
  
  2c1b33c4 Browse Files
30 Dec, 2019 2 commits
- 微信数据上报未支付订单不上传 · ae6da7bc
  shuhu.hou@freemud.cn committed Dec 30, 2019
  
  ae6da7bc Browse Files
- 暂存购物车校验 · 7516b168
  shuhu.hou@freemud.cn committed Dec 30, 2019
  
  7516b168 Browse Files
27 Dec, 2019 1 commit
- 促销Feign服务名修改 · 95c786d5
  ping.wu committed Dec 27, 2019
  
  95c786d5 Browse Files
26 Dec, 2019 2 commits
- Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of… · 961a6a4c
```
Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 26, 2019
  961a6a4c Browse Files
- 会员卡优惠金额修改 · 68801421
  ping.wu committed Dec 26, 2019
  
  68801421 Browse Files