Commits · 55341dcccad43058b7e4112dd5f9200f27d92aef · order-group-application / order-group · GitLab

09 Jan, 2020 1 commit
- 商城订单创建渠道赋值 · 55341dcc
  ping.wu committed Jan 09, 2020
  
  55341dcc Browse Files
08 Jan, 2020 8 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 '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
- 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
- 下单获取用户信息修改 · 8cce065b
  ping.wu committed Jan 08, 2020
  
  8cce065b Browse Files
07 Jan, 2020 10 commits
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into develop · 1b8a56fa
  dingkai committed Jan 07, 2020
  
  1b8a56fa Browse Files
- 删除换行 · 82de7198
  dingkai committed Jan 07, 2020
  
  82de7198 Browse Files
- 升级product-sdk版本 · 90fb352b
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  90fb352b Browse Files
- 围餐删除商品，升级jar · bd4e6759
  dingkai committed Jan 07, 2020
  
  bd4e6759 Browse Files
- Merge branch 'feature/1.9.9-围餐-20191218-dingkai' into develop · 3af60978
  dingkai committed Jan 07, 2020
  
  3af60978 Browse Files
- 围餐商品删除 · f79ef038
  dingkai committed Jan 07, 2020
  
  f79ef038 Browse Files
- 升级product-sdk版本 · 9fb944cd
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  9fb944cd Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 17ebcd3a
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  17ebcd3a Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into develop · f4096e8b
  shuhu.hou@freemud.cn committed Jan 07, 2020
  
  f4096e8b 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 develop · e8462339
  haibo.jiang committed Jan 06, 2020
  
  e8462339 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 develop · 83335012
  胡超 committed Jan 06, 2020
  
  83335012 Browse Files
- sessionKey · a86d43b0
  胡超 committed Jan 06, 2020
  
  a86d43b0 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · e03ee852
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  e03ee852 Browse Files
- Merge branch 'feature/1.9.9_购物车校验' into develop · 9766629d
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  9766629d Browse Files
- 修复addGoods接口，校验bug · 266abba2
  shuhu.hou@freemud.cn committed Jan 06, 2020
  
  266abba2 Browse Files
03 Jan, 2020 6 commits
- Merge remote-tracking branch 'remotes/origin/feature_20191226_1.9.9_sessionkey' into develop · 0285f9cb
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
```
  胡超 committed Jan 03, 2020
  0285f9cb Browse Files
- sessionKey · 6108d218
  胡超 committed Jan 03, 2020
  
  6108d218 Browse Files
- 升级sdk版本 · ab09a377
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  ab09a377 Browse Files
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · 80ac4674
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  80ac4674 Browse Files
- 创建订单添加三方单号 · 1b59e95d
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  1b59e95d Browse Files
- 回滚代码 · d9011769
  shuhu.hou@freemud.cn committed Jan 03, 2020
  
  d9011769 Browse Files
02 Jan, 2020 8 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
- Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · 9fe81284
  shuhu.hou@freemud.cn committed Jan 02, 2020
  
  9fe81284 Browse Files
- 创建订单添加needBonus字段 · e41f76db
  shuhu.hou@freemud.cn committed Jan 02, 2020
  
  e41f76db Browse Files
- Merge branch 'feature/mall-20191211-dingkai' into develop · 3640a185
  dingkai committed Jan 02, 2020
  
  3640a185 Browse Files
- 订单重量 · d8a7be79
  dingkai committed Jan 02, 2020
  
  d8a7be79 Browse Files
- Merge branch 'feature/mall-20191211-dingkai' into develop · 9c1751a3
  dingkai committed Jan 02, 2020
  
  9c1751a3 Browse Files
- 商城统一saasmall · 3adc44bf
  dingkai committed Jan 02, 2020
  
  3adc44bf Browse Files
- sumOrderWeight · 7c1ba332
  胡超 committed Jan 02, 2020
  
  7c1ba332 Browse Files