ufo / yohoufo-fore · Commits

21 Nov, 2018

4 commits

订单详情
4f291095

by wujiexiang
2018-11-21 13:40:09 +0800
Browse Files
取消订单，返还券
19254f65

by wujiexiang
2018-11-21 11:36:01 +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

20 Nov, 2018

20 commits

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
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
优惠券
aee9193a

by tanling
2018-11-20 18:05:23 +0800
Browse Files
优惠券删除
33528123

by tanling
2018-11-20 17:40:13 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion
1ac76acc

by tanling
2018-11-20 17:39:19 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion ...
272775b2
```
# Conflicts:
#	promotion/src/main/java/com/yohoufo/promotion/controller/OrderCouponController.java
```
by tanling
2018-11-20 17:39:08 +0800
Browse Files
add
6fa88d56

by wujiexiang
2018-11-20 17:38:29 +0800
Browse Files
优惠券
7018c50e

by tanling
2018-11-20 17:38:08 +0800
Browse Files
优惠券结算
fe4e00ba

by wujiexiang
2018-11-20 16:52:56 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion
73610803

by tanling
2018-11-20 11:49:57 +0800
Browse Files
优惠券使用退还
bca30d43

by tanling
2018-11-20 11:49:54 +0800
Browse Files
add
2c2362df

by wujiexiang
2018-11-20 11:14:55 +0800
Browse Files
优惠券结算
9744d17d

by wujiexiang
2018-11-20 11:00:50 +0800
Browse Files
Merge branch 'dev_order' into dev-promotion ...
1e6522c5
```
# Conflicts:
#	order/src/main/java/com/yohoufo/order/model/request/ShoppingRequest.java
```
by wujiexiang
2018-11-20 10:09:37 +0800
Browse Files
使用优惠券
44a44919

by wujiexiang
2018-11-20 10:07:09 +0800
Browse Files

19 Nov, 2018

15 commits

add batch check
988aa54e

by chenchao
2018-11-19 21:48:32 +0800
Browse Files
优惠券
9aafb125

by tanling
2018-11-19 20:39:04 +0800
Browse Files
query amount in seller wallet
b8d52cc4

by chenchao
2018-11-19 19:50:48 +0800
Browse Files
Merge branch 'dev_order' of http://git.yoho.cn/ufo/yohoufo-fore into dev_order
15e76a72

by caoyan
2018-11-19 18:25:50 +0800
Browse Files
Ufo批量接口
58d3d800

by caoyan
2018-11-19 18:25:14 +0800
Browse Files
Merge branch 'dev-promotion' of http://git.yoho.cn/ufo/yohoufo-fore into dev-promotion
b6960211

by tanling
2018-11-19 18:14:15 +0800
Browse Files
优惠券
9dd79dcd

by tanling
2018-11-19 18:14:11 +0800
Browse Files
change input param
a333704c

by chenchao
2018-11-19 17:33:35 +0800
Browse Files
add judge num
59189f0b

by chenchao
2018-11-19 15:40:35 +0800
Browse Files
提交商家充值mapper
be08e160

by Lixiaodi
2018-11-19 15:00:07 +0800
Browse Files
新增优惠券结算接口
63b20ff3

by wujiexiang
2018-11-19 14:56:31 +0800
Browse Files
优惠券
0c5daaf9

by tanling
2018-11-19 14:38:26 +0800
Browse Files
商家充值
5b7cf2b0

by Lixiaodi
2018-11-19 14:27:59 +0800
Browse Files
definition api req and resp
1cad6bdb

by chenchao
2018-11-19 11:24:30 +0800
Browse Files
promotion dal提交
60768b69

by tanling
2018-11-19 11:08:46 +0800
Browse Files

16 Nov, 2018

1 commit

add
2b261941

by wujiexiang
2018-11-16 19:00:40 +0800
Browse Files