ufo / yohoufo-fore · Commits

20 Sep, 2019

10 commits

寄存转现货发货后买家取消订单，买家订单详情页里违约金显示错误
3c1df275

by chenchao
2019-09-20 13:44:29 +0800
Browse Files
support use unshelf deposit goods deliver 2 buyer
b9b13604

by chenchao
2019-09-20 11:23:27 +0800
Browse Files
hidden waybill code
5fd3000b

by chenchao
2019-09-20 11:14:37 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12 ...
3e9dcdd4
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/DepositServiceImpl.java
```
by Lixiaodi
2019-09-20 10:51:48 +0800
Browse Files
物权转移修改
7f576208

by Lixiaodi
2019-09-20 10:49:01 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
f3b51349

by LUOXC
2019-09-20 10:16:58 +0800
Browse Files
钱包提现加入分布式锁
17ae26e6

by LUOXC
2019-09-20 10:16:42 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12 ...
3d2ce55e
```
# Conflicts:
#	web/src/main/resources/global.properties
```
by 张帅
2019-09-20 10:11:41 +0800
Browse Files
增加接口超时时间
3f0725bc

by 张帅
2019-09-20 10:10:33 +0800
Browse Files
fixbug
11d93448

by LUOXC
2019-09-20 10:06:28 +0800
Browse Files

19 Sep, 2019

30 commits

hidden waybill code
a85859d4

by chenchao
2019-09-19 22:07:58 +0800
Browse Files
寄存转现货发货后买家取消订单，买家订单详情页里违约金显示错误
3c62279d

by chenchao
2019-09-19 21:24:53 +0800
Browse Files
未上架的寄存商品
d524df0c

by chenchao
2019-09-19 21:16:06 +0800
Browse Files
fixbug
9a622d2a

by LUOXC
2019-09-19 21:05:43 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
2edd7ce9

by LUOXC
2019-09-19 21:04:48 +0800
Browse Files
fixbug
223d09a1

by LUOXC
2019-09-19 21:04:38 +0800
Browse Files
fix buyer cancel
c75dbe7c

by chenchao
2019-09-19 20:51:21 +0800
Browse Files
钱包文案
aa076b88

by LUOXC
2019-09-19 19:59:32 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
9c218ba0

by caoyan
2019-09-19 18:12:09 +0800
Browse Files
寄存转现货
9057b8ed

by caoyan
2019-09-19 18:12:02 +0800
Browse Files
fix 寄存转寄存交易成功，寄存商品未正确转到买家头上
bd65fef6

by chenchao
2019-09-19 18:09:49 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
44ec3ba5

by chenchao
2019-09-19 17:45:57 +0800
Browse Files
fix log
da129fd5

by chenchao
2019-09-19 17:45:50 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
06f3198e

by caoyan
2019-09-19 17:42:49 +0800
Browse Files
寄存转现货
2091eb4d

by caoyan
2019-09-19 17:42:40 +0800
Browse Files
fix 寄存转寄存交易成功，订单未按现货订单给卖家计算成功订单数
7eff3cd8

by chenchao
2019-09-19 17:23:41 +0800
Browse Files
fix deposit code source wrong
b82be28d

by chenchao
2019-09-19 17:11:59 +0800
Browse Files
Merge branch 'hotfix-0919' into test6.9.12
c264e837

by LUOXC
2019-09-19 17:10:48 +0800
Browse Files
add help
2e05b3da

by LUOXC
2019-09-19 17:09:45 +0800
Browse Files
Merge branch 'hotfix-0919' into test6.9.12 ...
249201f3
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderCancelService.java
```
by LUOXC
2019-09-19 16:59:36 +0800
Browse Files
如果退款金额为0则退款自动成功
269d916f

by LUOXC
2019-09-19 16:56:05 +0800
Browse Files
refacotr
5e6d5d71

by LUOXC
2019-09-19 16:32:56 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
195e6cfa

by mali
2019-09-19 15:42:08 +0800
Browse Files
yoho.logs.level.core
a33a1371

by mali
2019-09-19 15:42:02 +0800
Browse Files
Merge branch 'test6.9.12' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.12
c3983ede

by tanling
2019-09-19 15:39:47 +0800
Browse Files
回归代码
ebc69fea

by tanling
2019-09-19 15:39:44 +0800
Browse Files
fix value transfer loss
6264b129

by chenchao
2019-09-19 15:34:53 +0800
Browse Files
寄存转现货
6c8566df

by caoyan
2019-09-19 15:18:15 +0800
Browse Files
买家货款打到卖家钱包，原订单现货保证金未退还
45ff4e28

by chenchao
2019-09-19 14:43:03 +0800
Browse Files
给钱包提供支付宝账号查询接口
a296528d

by 张帅
2019-09-19 11:35:29 +0800
Browse Files