|
@@ -785,7 +785,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
public JSONObject getGmvHour(@ApiParam("创建人ID") @RequestParam(value = "userId", required = true) Long userId,
|
|
|
@ApiParam("类型,1-渠道;2-招商") @RequestParam(value = "type", required = true) String type,
|
|
|
@ApiParam("媒体,1-抖音;2-快手") @RequestParam(value = "mediaId", required = false) String mediaId,
|
|
|
- @ApiParam("开始日期") @RequestParam(value = "startDate", required = false) String startDate,
|
|
|
+ @ApiParam("开始日期") @RequestParam(value = "statDate", required = false) String statDate,
|
|
|
@ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate
|
|
|
) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
@@ -795,13 +795,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
}
|
|
|
String nowDate = DateUtils.getNowDate("yyyy-MM-dd"); // 当天
|
|
|
String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 日期 -1
|
|
|
- if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
|
|
|
- List<String> allDatesOfTwoTimes = DateUtils.getAllDatesOfTwoTimes(startDate, endDate);
|
|
|
+ if (!Check.isNull(statDate) && !Check.isNull(endDate)) {
|
|
|
+ List<String> allDatesOfTwoTimes = DateUtils.getAllDatesOfTwoTimes(statDate, endDate);
|
|
|
if (allDatesOfTwoTimes.size() == 2) {
|
|
|
nowDate = endDate;
|
|
|
- lastDate = startDate;
|
|
|
+ lastDate = statDate;
|
|
|
} else if (allDatesOfTwoTimes.size() == 1) {
|
|
|
- nowDate = startDate;
|
|
|
+ nowDate = statDate;
|
|
|
lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 日期 -1
|
|
|
}
|
|
|
}
|