Commit 92aed895 authored by 陈炯舟's avatar 陈炯舟

Merge branch 'dev-8.9.0' into 'master'

Dev 8.9.0

See merge request !35
parents 47482d8a a74b0bec
...@@ -80,10 +80,6 @@ public class FawOpenController extends BaseController { ...@@ -80,10 +80,6 @@ public class FawOpenController extends BaseController {
if (!type.equals(quarter) && !type.equals(monthly)) { if (!type.equals(quarter) && !type.equals(monthly)) {
return error("90001", "type传参异常,未开放数据类型"); return error("90001", "type传参异常,未开放数据类型");
} }
BaseResponse check = baseService.baseValidator(request,client, dataType, limit, limitPeriod);
if (check != null) {
return check;
}
return success(fawOpenService.awemes(publishDateStart, publishDateEnd, type, pageNum, pageSize)); return success(fawOpenService.awemes(publishDateStart, publishDateEnd, type, pageNum, pageSize));
} }
...@@ -109,10 +105,6 @@ public class FawOpenController extends BaseController { ...@@ -109,10 +105,6 @@ public class FawOpenController extends BaseController {
if (!type.equals(quarter) && !type.equals(monthly)) { if (!type.equals(quarter) && !type.equals(monthly)) {
return error("90001", "type传参异常,未开放数据类型!"); return error("90001", "type传参异常,未开放数据类型!");
} }
BaseResponse check = baseService.baseValidator(request, client, dataType, limit, limitPeriod);
if (check != null) {
return check;
}
return success(fawOpenService.lives(publishDateStart, publishDateEnd, type, pageNum, pageSize)); return success(fawOpenService.lives(publishDateStart, publishDateEnd, type, pageNum, pageSize));
} }
......
...@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service; ...@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
/** /**
* @author chin * @author chin
...@@ -49,6 +50,10 @@ public class FawOpenService { ...@@ -49,6 +50,10 @@ public class FawOpenService {
static String quarter = "quarter"; static String quarter = "quarter";
public BasePageVO<HongqiAwemeIncentiveVO> awemes(Date publishDateStart, Date publishDateEnd, String type, Integer pageNum, Integer pageSize) { public BasePageVO<HongqiAwemeIncentiveVO> awemes(Date publishDateStart, Date publishDateEnd, String type, Integer pageNum, Integer pageSize) {
try {
TimeUnit.MILLISECONDS.sleep(500L);
} catch (InterruptedException ignored) {
}
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
if (monthly.equals(type)) { if (monthly.equals(type)) {
IPage<HongqiAwemeIncentiveMonthly> page = new Page<>(pageNum, pageSize); IPage<HongqiAwemeIncentiveMonthly> page = new Page<>(pageNum, pageSize);
...@@ -72,6 +77,10 @@ public class FawOpenService { ...@@ -72,6 +77,10 @@ public class FawOpenService {
} }
public BasePageVO<HongqiLiveIncentiveVO> lives(Date publishDateStart, Date publishDateEnd, String type, Integer pageNum, Integer pageSize) { public BasePageVO<HongqiLiveIncentiveVO> lives(Date publishDateStart, Date publishDateEnd, String type, Integer pageNum, Integer pageSize) {
try {
TimeUnit.MILLISECONDS.sleep(500L);
} catch (InterruptedException ignored) {
}
PageHelper.orderBy(" publish_time DESC "); PageHelper.orderBy(" publish_time DESC ");
if (monthly.equals(type)) { if (monthly.equals(type)) {
IPage<HongqiLiveIncentiveMonthly> page = new Page<>(pageNum, pageSize); IPage<HongqiLiveIncentiveMonthly> page = new Page<>(pageNum, pageSize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment