Commits · 231069492bbd512c3777db3d7112f506805980d4 · jenkins / order-group

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 14 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
- 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 =》 menuType · a1bafd54
  姜海波 committed Jan 10, 2020
  
  a1bafd54 Browse Files
- businessType =》 menuType · a88e8cd6
  姜海波 committed Jan 10, 2020
  
  a88e8cd6 Browse Files
09 Jan, 2020 10 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
- 添加支付宝渠道 · e0a6cdd9
  shuhu.hou@freemud.cn committed Jan 09, 2020
  
  e0a6cdd9 Browse Files
- 商城订单创建渠道赋值 · 55341dcc
  ping.wu committed Jan 09, 2020
  
  55341dcc Browse Files
08 Jan, 2020 15 commits
- 代码冲突修改 · 9df7b7c4
  ping.wu committed Jan 08, 2020
  
  9df7b7c4 Browse Files
- Merge branches 'develop' and 'feature/20200103_支付宝支付下单_wuping' of… · cdce86b5
```
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
#	call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jan 08, 2020
  cdce86b5 Browse Files
- 支付宝下单 · fae1b590
  ping.wu committed Jan 08, 2020
  
  fae1b590 Browse Files
- 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 develop · 73928554
  shuhu.hou@freemud.cn committed Jan 08, 2020
  
  73928554 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 develop · ae19d135
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
```
  shuhu.hou@freemud.cn committed Jan 08, 2020
  ae19d135 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
- 下单获取用户信息修改 · 8cce065b
  ping.wu committed Jan 08, 2020
  
  8cce065b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' · 2e7b1ae7
  胡超 committed Jan 08, 2020
  
  2e7b1ae7 Browse Files