ufo / yohoufo-fore · Commits

09 Mar, 2020

6 commits

Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.22
68787ac7

by TANLING
2020-03-09 16:39:33 +0800
Browse Files
商品详情页过滤掉优惠券限制条件
81d34882

by TANLING
2020-03-09 16:39:29 +0800
Browse Files
Merge branch 'hotfix-bid' into test6.9.22 ...
8da21101
```
Conflicts:
	order/src/main/java/com/yohoufo/order/service/impl/statechange/BuyerOrderBidingCancelChanger.java
```
by wujiexiang
2020-03-09 15:08:59 +0800
Browse Files
求购订单取消时，若存在未完成的调价记录，则不需要取消
cf914816

by wujiexiang
2020-03-09 15:07:22 +0800
Browse Files
买家求购订单取消时，若存在未完成的调价记录，则不需要取消
0e734200

by wujiexiang
2020-03-09 14:11:48 +0800
Browse Files
fix bug
1c06d646

by TANLING
2020-03-09 11:52:18 +0800
Browse Files

06 Mar, 2020

17 commits

Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.22
b85722cb

by TANLING
2020-03-06 23:46:47 +0800
Browse Files
优惠券限制
e7b5514e

by TANLING
2020-03-06 23:46:44 +0800
Browse Files
增加便于测试的方法
8bfe61a9

by wujiexiang
2020-03-06 21:56:29 +0800
Browse Files
fix log
63776f41

by TANLING
2020-03-06 18:10:34 +0800
Browse Files
add log
b084d49c

by TANLING
2020-03-06 17:37:07 +0800
Browse Files
add cache
f108a07e

by TANLING
2020-03-06 17:29:16 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.22
731eb65a

by TANLING
2020-03-06 17:17:55 +0800
Browse Files
优惠券限制
cb2571bd

by TANLING
2020-03-06 17:17:43 +0800
Browse Files
add refund seller coupon
32ae8d9a

by chenchao
2020-03-06 17:13:03 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.22
7f3a609f

by wujiexiang
2020-03-06 17:12:13 +0800
Browse Files
删除不需要的条件
63c1c9b5

by wujiexiang
2020-03-06 17:11:50 +0800
Browse Files
Merge branch 'test6.9.22' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.22
854dd7bf

by TANLING
2020-03-06 17:07:22 +0800
Browse Files
优惠券限制可叠加
700211fc

by TANLING
2020-03-06 17:07:19 +0800
Browse Files
修改类名
7366c89b

by wujiexiang
2020-03-06 16:02:27 +0800
Browse Files
添加单元测试
b744ed71

by wujiexiang
2020-03-06 15:46:59 +0800
Browse Files
add log
19a8206f

by chenchao
2020-03-06 10:52:28 +0800
Browse Files
添加买家地址信息
e5d945c1

by LUOXC
2020-03-06 10:03:19 +0800
Browse Files

05 Mar, 2020

17 commits

Merge branch 'hotfix-PlatformServiceFee' into test6.9.22
90e9c9f6

by wujiexiang
2020-03-05 21:55:30 +0800
Browse Files
修改获取当前秒数的方法
d690ecc9

by wujiexiang
2020-03-05 21:53:52 +0800
Browse Files
Merge branch 'hotfix-PlatformServiceFee' into test6.9.22
14e07d11

by wujiexiang
2020-03-05 20:13:18 +0800
Browse Files
之前的修改太复杂，简单修改
4476c0fe

by wujiexiang
2020-03-05 20:10:03 +0800
Browse Files
add build
7b015d9f

by chenchao
2020-03-05 18:55:10 +0800
Browse Files
极速
a1a9693a

by TANLING
2020-03-05 18:39:52 +0800
Browse Files
add submit
c8948947

by chenchao
2020-03-05 17:35:11 +0800
Browse Files
Merge branch 'hotfix-PlatformServiceFee' into test6.9.22
a7ea4e66

by wujiexiang
2020-03-05 17:06:19 +0800
Browse Files
添加注释
f31941ea

by wujiexiang
2020-03-05 17:06:03 +0800
Browse Files
Merge branch 'hotfix-PlatformServiceFee' into test6.9.22
de74c429

by wujiexiang
2020-03-05 16:52:18 +0800
Browse Files
若匹配不到服务费配置，则服务费返回null
ec34345d

by wujiexiang
2020-03-05 16:51:55 +0800
Browse Files
Merge branch 'hotfix-20200305' into test6.9.22
d41d0172

by LUOXC
2020-03-05 16:14:24 +0800
Browse Files
Revert "如果转账单已经存在，不能新增" ...
d7371da8
```
This reverts commit ad73999d.
```
by LUOXC
2020-03-05 16:14:15 +0800
Browse Files
Merge branch 'hotfix-20200305' into test6.9.22
8a7d4675

by LUOXC
2020-03-05 15:48:38 +0800
Browse Files
如果转账单已经存在，不能新增
ad73999d

by LUOXC
2020-03-05 15:48:23 +0800
Browse Files
merge one folder
191aaace

by chenchao
2020-03-05 10:01:01 +0800
Browse Files
fix serialize & deserialize issue
94062932

by chenchao
2020-03-05 09:32:18 +0800
Browse Files