ufo / yohoufo-fore · Commits

20 Nov, 2018

4 commits

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

5 commits

add
2b261941

by wujiexiang
2018-11-16 19:00:40 +0800
Browse Files
Merge branch 'dev_1113_generateCode' into dev_order
8359504e

by chenchao
2018-11-16 18:17:20 +0800
Browse Files
add promotion module
b14aaa76

by wujiexiang
2018-11-16 17:44:52 +0800
Browse Files
add config
cebcfc8c

by chenchao
2018-11-16 16:05:19 +0800
Browse Files
Merge branch 'dev_支持买家退款' into dev_order ...
f8024a6e
```
# Conflicts:
#	web/src/main/resources/config.properties
#	web/src/main/webapp/META-INF/autoconf/config.properties
```
by chenchao
2018-11-16 09:55:00 +0800
Browse Files

15 Nov, 2018

5 commits

add config
21fbbd76

by chenchao
2018-11-15 17:53:53 +0800
Browse Files
支持买家退款
149f0de8

by Lixiaodi
2018-11-15 11:34:20 +0800
Browse Files
add config
ccedca8b

by chenchao
2018-11-15 10:45:44 +0800
Browse Files
支持买家退款
a83d2aea

by Lixiaodi
2018-11-15 10:31:24 +0800
Browse Files
Merge branch 'gray' into dev_order
da7c3859

by chenchao
2018-11-15 10:31:07 +0800
Browse Files

14 Nov, 2018

11 commits

split logic
08d531d9

by chenchao
2018-11-14 19:36:20 +0800
Browse Files
machine
d6e716c5

by tanling
2018-11-14 18:23:18 +0800
Browse Files
machine
ff70bd85

by tanling
2018-11-14 18:17:37 +0800
Browse Files
machineid
715dab5e

by tanling
2018-11-14 18:05:06 +0800
Browse Files
machineid的重新创建
b5cf8237

by tanling
2018-11-14 17:48:24 +0800
Browse Files
Merge branch 'dev6.8.1' into gray
3547b935

by mali
2018-11-14 17:01:13 +0800
Browse Files
fix
9e99c36a

by chenchao
2018-11-14 16:57:13 +0800
Browse Files
Merge branch 'dev6.8.1' into gray
9e740b2f

by mali
2018-11-14 14:39:34 +0800
Browse Files
move count
30fff528

by chenchao
2018-11-14 14:36:47 +0800
Browse Files
Merge branch 'dev6.8.1' into gray
801557a3

by mali
2018-11-14 10:43:48 +0800
Browse Files
isolated branch 4 gray
9b701247

by chenchao
2018-11-14 10:39:11 +0800
Browse Files