Commits · 2a6f13c016e4642d589b88ece2f1fce49f817659 · jenkins / order-group

19 Feb, 2020 1 commit
- 校验创建配送单参数 · 2a6f13c0
  huvchao@126.com committed Feb 19, 2020
  
  2a6f13c0 Browse Files
18 Feb, 2020 4 commits
- order-management · 0f05daa6
  huvchao@126.com committed Feb 18, 2020
  
  0f05daa6 Browse Files
- deliverycenter-sdk · b44ca46c
  huvchao@126.com committed Feb 18, 2020
  
  b44ca46c Browse Files
- orderDeliveryQueue · 60ff567f
  huvchao@126.com committed Feb 18, 2020
  
  60ff567f Browse Files
- testOrderDelivery · 843ee1d4
  huvchao@126.com committed Feb 18, 2020
  
  843ee1d4 Browse Files
17 Feb, 2020 1 commit
- add#配送单更新时间 · 2397d23a
  huvchao@126.com committed Feb 18, 2020
  
  2397d23a Browse Files
15 Feb, 2020 1 commit
- 订单配送信息变化时推送到mq · 22d88483
  huvchao@126.com committed Feb 16, 2020
  
  22d88483 Browse Files
13 Feb, 2020 1 commit
- # add · bcffcadc
```
order-management
```
  huvchao@126.com committed Feb 13, 2020
  bcffcadc Browse Files
18 Jan, 2020 3 commits
- Merge branch 'feature/20200117_核销券失败退款兼容' · 9029c5e9
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  9029c5e9 Browse Files
- 核销券码失败，直接返回 · 28f4d5e1
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  28f4d5e1 Browse Files
- 优惠为空时，不再核销券 · 7ecd9618
  shuhu.hou@freemud.cn committed Jan 18, 2020
  
  7ecd9618 Browse Files
17 Jan, 2020 3 commits

支付sdk修改 · 3df7f9f6
ping.wu committed Jan 17, 2020

3df7f9f6 Browse Files

Merge branches 'feature/20200103_支付宝支付下单_wuping' and… · 072dad30

Merge branches 'feature/20200103_支付宝支付下单_wuping' and 'feature/20200117_支付宝下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20200117_支付宝下单_wuping

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java

committed Jan 17, 2020

072dad30 Browse Files

核销券失败，退款兼容 · 10911b68
shuhu.hou@freemud.cn committed Jan 17, 2020

10911b68 Browse Files

15 Jan, 2020 2 commits
- 商品校验接口，返回非100状态码时直接移除购物车 · 55df2093
  shuhu.hou@freemud.cn committed Jan 15, 2020
  
  55df2093 Browse Files
- 商品校验接口，返回非100状态码时直接移除购物车 · 18fd0949
  shuhu.hou@freemud.cn committed Jan 15, 2020
  
  18fd0949 Browse Files
14 Jan, 2020 6 commits
- 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 17 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
- 创建订单OrderClient参数兼容 · 787b8b79
  ping.wu committed Jan 13, 2020
  
  787b8b79 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
10 Jan, 2020 1 commit
- 增加对象判空 · d5b60d47
  姜海波 committed Jan 10, 2020
  
  d5b60d47 Browse Files