ufo / yohoufo-fore · Commits

27 Jun, 2019

16 commits

fix payment show tariff amount when goods in hk
a7fd339e

by chenchao
2019-06-27 15:25:08 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
7d9d5827

by chenchao
2019-06-27 15:07:37 +0800
Browse Files
use enum stand by depot type
f2c24b1d

by chenchao
2019-06-27 14:49:23 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
286021e0

by LUOXC
2019-06-27 14:47:52 +0800
Browse Files
限制香港使用优惠券
a8cf4eae

by LUOXC
2019-06-27 14:47:41 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
22fc0185

by chenchao
2019-06-27 14:46:20 +0800
Browse Files
skup type tag
debecde9

by chenchao
2019-06-27 14:45:44 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
e5f0b86c

by LUOXC
2019-06-27 14:44:56 +0800
Browse Files
限制香港地区用券
d2ea22e4

by LUOXC
2019-06-27 14:44:43 +0800
Browse Files
depot num support hk
d94415e7

by chenchao
2019-06-27 14:34:10 +0800
Browse Files
Merge branch 'hotfix_质检app' into test6.9.7
80be4f42

by mali
2019-06-27 14:23:46 +0800
Browse Files
Merge branch 'dev_确认收货优化' into test6.9.7 ...
3e6cc856
```
Conflicts:
	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
```
by mali
2019-06-27 14:22:55 +0800
Browse Files
结算发邮件
a89f830e

by LUOXC
2019-06-27 11:43:25 +0800
Browse Files
去掉注释
5c21ad24

by qinchao
2019-06-27 09:53:56 +0800
Browse Files
清关物流mq 消费：自动确认收货和清关失败通知
d37f791d

by qinchao
2019-06-27 09:40:28 +0800
Browse Files
add tariff price in order detail
4db53962

by chenchao
2019-06-27 09:28:53 +0800
Browse Files

26 Jun, 2019

23 commits

compensate coupons 2 buyer when platform fired
880bae76

by chenchao
2019-06-26 18:19:41 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
114b7be4

by caoyan
2019-06-26 17:12:52 +0800
Browse Files
香港直邮
275ad3bd

by caoyan
2019-06-26 17:12:30 +0800
Browse Files
calculate ship fee
fa6b4269

by chenchao
2019-06-26 17:11:12 +0800
Browse Files
加注释
edefcdca

by qinchao
2019-06-26 16:56:31 +0800
Browse Files
fix bug
01576fa1

by qinchao
2019-06-26 16:44:25 +0800
Browse Files
清关数据保存
36406577

by qinchao
2019-06-26 16:39:45 +0800
Browse Files
bug修改
12303dd2

by Lixiaodi
2019-06-26 16:06:27 +0800
Browse Files
add log
d488c99a

by chenchao
2019-06-26 16:00:42 +0800
Browse Files
overseas order no need auto confirm
644f4aa6

by chenchao
2019-06-26 15:09:50 +0800
Browse Files
fix
ab9c4a21

by chenchao
2019-06-26 14:50:03 +0800
Browse Files
重新上架现货、二手类型
aac1954b

by qinchao
2019-06-26 14:34:22 +0800
Browse Files
fix bug
566913cf

by LUOXC
2019-06-26 14:12:40 +0800
Browse Files
fix import class path com.yoho.tools.common.beans
52ec8ae5

by chenchao
2019-06-26 13:04:26 +0800
Browse Files
Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
fee3fba1

by LUOXC
2019-06-26 11:44:46 +0800
Browse Files
fix bug
6e3278d6

by LUOXC
2019-06-26 11:44:09 +0800
Browse Files
Merge branch 'hotfix_质检app' into test6.9.7
de6c3e4e

by mali
2019-06-26 11:43:33 +0800
Browse Files
质检app增加虚假发货寄回的场景
10ca07b2

by mali
2019-06-26 11:43:27 +0800
Browse Files
Merge branch 'hotfix_质检app' into test6.9.7
93438471

by mali
2019-06-26 11:11:41 +0800
Browse Files
质检app增加虚假发货寄回的场景
f05a6330

by mali
2019-06-26 11:11:34 +0800
Browse Files
fix log
5509747b

by qinchao
2019-06-26 10:58:14 +0800
Browse Files
Revert "发货超时，test" ...
91d826b7
```
This reverts commit fa26185b.
```
by qinchao
2019-06-26 10:45:04 +0800
Browse Files
发货超时，test
fa26185b

by qinchao
2019-06-26 10:10:53 +0800
Browse Files

25 Jun, 2019

1 commit

Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7
5863f86c

by chenchao
2019-06-25 19:07:40 +0800
Browse Files