ufo / yohoufo-fore · Commits

21 Nov, 2018

23 commits

入驻和退驻后发消息
5e8d6452

by qinchao
2018-11-21 16:50:54 +0800
Browse Files
fix
b40aee0e

by chenchao
2018-11-21 14:37:54 +0800
Browse Files
Merge branch 'dev_order' into test6.8.2 ...
76dd0dc9
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by chenchao
2018-11-21 14:23:17 +0800
Browse Files
finish seller order list query sql
f7aef2ce

by chenchao
2018-11-21 14:21:24 +0800
Browse Files
Merge branch 'dev-promotion' into test6.8.2
69fa0307

by wujiexiang
2018-11-21 13:40:33 +0800
Browse Files
订单详情
4f291095

by wujiexiang
2018-11-21 13:40:09 +0800
Browse Files
Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.2
b05956ca

by mlge
2018-11-21 11:43:00 +0800
Browse Files
修改接口名称
61977edf

by mlge
2018-11-21 11:42:43 +0800
Browse Files
Merge branch 'dev-promotion' into test6.8.2 ...
254d7b9b
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by wujiexiang
2018-11-21 11:38:08 +0800
Browse Files
取消订单，返还券
19254f65

by wujiexiang
2018-11-21 11:36:01 +0800
Browse Files
bug修改
436c8cb7

by Lixiaodi
2018-11-21 11:23:06 +0800
Browse Files
Merge branch 'dev_qc_1121_fix' into test6.8.2
f57fe599

by qinchao
2018-11-21 11:22:30 +0800
Browse Files
增加支付宝绑定接口
1702b646

by mlge
2018-11-21 11:19:24 +0800
Browse Files
退驻
a1bf5b7c

by qinchao
2018-11-21 11:16:57 +0800
Browse Files
用户绑定支付宝账号接口
bc7261a6

by mlge
2018-11-21 10:44:36 +0800
Browse Files
Merge branch 'dev-promotion' into test6.8.2
fd12375f

by tanling
2018-11-21 10:43:24 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion
6277d68a

by tanling
2018-11-21 10:41:54 +0800
Browse Files
批量发送优惠券
bcd335c7

by tanling
2018-11-21 10:41:50 +0800
Browse Files
Merge branch 'dev-promotion' into test6.8.2
8879fd23

by chenchao
2018-11-21 10:32:23 +0800
Browse Files
Merge branch 'dev-promotion' into dev_order
20fcfc07

by chenchao
2018-11-21 10:32:13 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order ...
690cd7e6
```
# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml
```
by Lixiaodi
2018-11-21 10:19:45 +0800
Browse Files
更新时间设为0
181ba512

by Lixiaodi
2018-11-21 10:17:49 +0800
Browse Files
add log
1a46ffec

by chenchao
2018-11-21 10:05:06 +0800
Browse Files

20 Nov, 2018

17 commits

Merge branch 'dev_order' into test6.8.2 ...
d867af03
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderService.java
```
by chenchao
2018-11-20 22:14:47 +0800
Browse Files
finish batch publish prds
8fa98318

by chenchao
2018-11-20 22:08:44 +0800
Browse Files
update
d7c7c8b5

by wujiexiang
2018-11-20 21:11:59 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion ...
578190cb
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SubmitOrderServiceImpl.java
```
by wujiexiang
2018-11-20 20:54:58 +0800
Browse Files
优惠券结算
cd8fe8c0

by wujiexiang
2018-11-20 20:50:41 +0800
Browse Files
提交订单归还库存
dbde0719

by tanling
2018-11-20 20:40:15 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
6a290a9c

by Lixiaodi
2018-11-20 20:04:37 +0800
Browse Files
修改记账分总账分账
7f21a396

by Lixiaodi
2018-11-20 20:04:28 +0800
Browse Files
no message
97f665c8

by tanling
2018-11-20 19:30:22 +0800
Browse Files
优惠券
1dfb13a3

by tanling
2018-11-20 18:30:33 +0800
Browse Files
优惠券
56bc468c

by tanling
2018-11-20 18:27:05 +0800
Browse Files
Merge branch 'dev_qc_1120_deposit2' into test6.8.2
a8b957c7

by qinchao
2018-11-20 18:10:05 +0800
Browse Files
商户退出，售卖商品和订单检查
7b0336fd

by qinchao
2018-11-20 18:09:33 +0800
Browse Files
优惠券
aee9193a

by tanling
2018-11-20 18:05:23 +0800
Browse Files
Merge branch 'dev-promotion' into test6.8.2
609ba53e

by wujiexiang
2018-11-20 17:47:42 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
186256c6

by caoyan
2018-11-20 17:47:12 +0800
Browse Files
Ufo批量接口
45839f53

by caoyan
2018-11-20 17:47:03 +0800
Browse Files