Commits · 7fc05d4845db51949f1d997ecfba221974305c2f · jenkins / order-group · GitLab

15 Jan, 2020 2 commits
- Merge branch 'hotfix/20200115_商品校验接口失败移除购物车' into qa · 7fc05d48
  shuhu.hou@freemud.cn committed Jan 15, 2020
  
  7fc05d48 Browse Files
- 商品校验接口，返回非100状态码时直接移除购物车 · 18fd0949
  shuhu.hou@freemud.cn committed Jan 15, 2020
  
  18fd0949 Browse Files
14 Jan, 2020 9 commits
- 合并分支 · d2992635
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  d2992635 Browse Files
- 合并分支 · c91e3029
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  c91e3029 Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into qa · dfe7ec21
```
# Conflicts:
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
```
  shuhu.hou@freemud.cn committed Jan 14, 2020
  dfe7ec21 Browse Files
- Merge branch 'feature/1.9.9_购物车校验' · 70681ef6
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  70681ef6 Browse Files
- 兼容sku、spu判断逻辑 · a88a1bbb
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  a88a1bbb Browse Files
- Merge branch 'feature/1.9.9_购物车校验' · 1e1de1e6
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  1e1de1e6 Browse Files
- 若商品详情赋值有异常，直接移除购物车 · 35c0823f
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  35c0823f Browse Files
- Merge branch 'feature/1.9.9_购物车校验' · 31d3b0f3
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  31d3b0f3 Browse Files
- 若商品详情赋值有异常，直接移除购物车 · 9675e3a3
  shuhu.hou@freemud.cn committed Jan 14, 2020
  
  9675e3a3 Browse Files
13 Jan, 2020 16 commits
- Merge remote-tracking branch 'origin/master' · 26c9fa4f
  ping.wu committed Jan 13, 2020
  
  26c9fa4f Browse Files
- 升级商品sdk版本 · fce0b00d
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  fce0b00d Browse Files
- Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'master' of… · 30043e3d
```
Merge branches 'feature/20200102_下单返回订单类型_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jan 13, 2020
  30043e3d Browse Files
- Merge branch 'feature/1.9.9_购物车校验' · 7648de49
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  7648de49 Browse Files
- 非空判断 · 301d9d95
  ping.wu committed Jan 13, 2020
  
  301d9d95 Browse Files
- 校验门店菜单，也传入商品券商品 · dd8a026b
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  dd8a026b Browse Files
- 1.1.5.RELEASE · 91240e76
  胡超 committed Jan 13, 2020
  
  91240e76 Browse Files
- 新增sessionKey，用于微信支付上报 · 363873d7
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  363873d7 Browse Files
- 升级商品服务sdk版本 · 055829a4
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  055829a4 Browse Files
- 升级基础订单sdk · 68f2ef82
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  68f2ef82 Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' · 0adf27f0
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	ordercenter-sdk/pom.xml
```
  shuhu.hou@freemud.cn committed Jan 13, 2020
  0adf27f0 Browse Files
- 创建订单添加第三方品类id · 935aff4a
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  935aff4a 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
11 Jan, 2020 4 commits
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into qa · 0c42067a
  姜海波 committed Jan 11, 2020
  
  0c42067a Browse Files
- menuType修改 · 9ead35ad
  姜海波 committed Jan 11, 2020
  
  9ead35ad Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into qa · 32d37371
  姜海波 committed Jan 11, 2020
  
  32d37371 Browse Files
- menuType修改 · 9b10dfb3
  姜海波 committed Jan 11, 2020
  
  9b10dfb3 Browse Files
10 Jan, 2020 9 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into qa · bd3cb75d
  姜海波 committed Jan 10, 2020
  
  bd3cb75d Browse Files
- 变量命名首字母变小写 · 083a741f
  dingkai committed Jan 10, 2020
  
  083a741f Browse Files
- 围餐传固定值 · f7105d0a
  dingkai committed Jan 10, 2020
  
  f7105d0a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into qa · 436d77c7
  姜海波 committed Jan 10, 2020
  
  436d77c7 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into qa · 8d97fe08
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Jan 10, 2020
  8d97fe08 Browse Files
- Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波' into qa · 8e8ea45f
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Jan 10, 2020
  8e8ea45f Browse Files
- 修改类型 · 6f1984af
  姜海波 committed Jan 10, 2020
  
  6f1984af Browse Files
- 增加对象判空 · 0debc1d3
  姜海波 committed Jan 10, 2020
  
  0debc1d3 Browse Files
- 增加对象判空 · 66c6c233
  姜海波 committed Jan 10, 2020
  
  66c6c233 Browse Files