Commits · 074635946e46170906da660360b14467690e9588 · jenkins / order-group

13 Jan, 2020 15 commits
- Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of… · 07463594
```
Merge branches 'develop' and 'feature/20200102_下单返回订单类型_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jan 13, 2020
  07463594 Browse Files
- 备注修改 · c09c334a
  ping.wu committed Jan 13, 2020
  
  c09c334a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · da4247aa
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  da4247aa Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into develop · fcda1c7a
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	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 13, 2020
  fcda1c7a Browse Files
- 非空判断 · 301d9d95
  ping.wu committed Jan 13, 2020
  
  301d9d95 Browse Files
- 校验门店菜单，也传入商品券商品 · dd8a026b
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  dd8a026b Browse Files
- Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of… · 8ff418b9
```
Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  ping.wu committed Jan 13, 2020
  8ff418b9 Browse Files
- 创建订单OrderClient参数兼容 · 787b8b79
  ping.wu committed Jan 13, 2020
  
  787b8b79 Browse Files
- 创建订单添加第三方品类id · f974dbe5
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  f974dbe5 Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · f5778b1c
  shuhu.hou@freemud.cn committed Jan 13, 2020
  
  f5778b1c 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 1 commit
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 23106949
  姜海波 committed Jan 11, 2020
  
  23106949 Browse Files
10 Jan, 2020 16 commits
- 变量命名首字母变小写 · 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 develop · 9fce2aea
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
```
  姜海波 committed Jan 10, 2020
  9fce2aea 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 · 7163d05b
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Jan 10, 2020
  7163d05b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 54a1dce0
  姜海波 committed Jan 10, 2020
  
  54a1dce0 Browse Files
- 修改类型 · 6f1984af
  姜海波 committed Jan 10, 2020
  
  6f1984af Browse Files
- 增加对象判空 · 66c6c233
  姜海波 committed Jan 10, 2020
  
  66c6c233 Browse Files
- 增加对象判空 · d5b60d47
  姜海波 committed Jan 10, 2020
  
  d5b60d47 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 94c027a2
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Jan 10, 2020
  94c027a2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop · 3e39749a
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  姜海波 committed Jan 10, 2020
  3e39749a Browse Files
- 增加BusinessType · ac14a3bb
  姜海波 committed Jan 10, 2020
  
  ac14a3bb Browse Files
- 增加BusinessType · 0901b712
  姜海波 committed Jan 10, 2020
  
  0901b712 Browse Files
- 增加BusinessType · 25855208
  姜海波 committed Jan 10, 2020
  
  25855208 Browse Files
- businessType =》 menuType · a1bafd54
  姜海波 committed Jan 10, 2020
  
  a1bafd54 Browse Files
- businessType =》 menuType · a88e8cd6
  姜海波 committed Jan 10, 2020
  
  a88e8cd6 Browse Files
09 Jan, 2020 8 commits
- Merge branches 'develop' and 'feature/20200109_微信订阅消息' of… · 33ef5605
```
Merge branches 'develop' and 'feature/20200109_微信订阅消息' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jan 09, 2020
  33ef5605 Browse Files
- 微信消息sdk升级 · c31005a7
  ping.wu committed Jan 09, 2020
  
  c31005a7 Browse Files
- 订单sdk版本升级 · 9c962625
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  9c962625 Browse Files
- Merge branch 'feature/20200103_支付宝支付下单_wuping' into develop · 5e744f36
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java
```
  shuhu.hou@freemud.cn committed Jan 09, 2020
  5e744f36 Browse Files
- 同步sdk版本 · 11a13958
  ping.wu committed Jan 09, 2020
  
  11a13958 Browse Files
- Merge branch 'feature/20200109_微信订阅消息' into develop · b3aaa769
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed Jan 09, 2020
  b3aaa769 Browse Files
- 返回支付宝渠道名称 · c064b818
  ping.wu committed Jan 09, 2020
  
  c064b818 Browse Files
- 微信订阅消息版本升级 · 22bb1769
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  22bb1769 Browse Files