|
@@ -15,6 +15,7 @@ import com.ruixuan.common.core.domain.AjaxResult;
|
|
|
import com.ruixuan.common.core.domain.entity.SysUser;
|
|
|
import com.ruixuan.common.core.page.TableDataInfo;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
|
+import com.ruixuan.common.utils.DateUtils;
|
|
|
import com.ruixuan.data.utils.ExportExcelUtils;
|
|
|
import com.ruixuan.isc.entity.*;
|
|
|
import com.ruixuan.isc.enums.CompanyEnum;
|
|
@@ -774,20 +775,35 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
|
|
|
|
|
|
@GetMapping("/getGmvHour")
|
|
|
- @ApiOperation(value = "工作台——订单数据")
|
|
|
+ @ApiOperation(value = "工作台——分时数据")
|
|
|
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("媒体,1-抖音;2-快手") @RequestParam(value = "mediaId", required = false) String mediaId,
|
|
|
+ @ApiParam("开始日期") @RequestParam(value = "statDate", required = false) String startDate,
|
|
|
+ @ApiParam("结束日期") @RequestParam(value = "endDate", required = false) String endDate
|
|
|
) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
try {
|
|
|
if (Check.isNull(userId)) {
|
|
|
throw new Exception("请传入人员ID");
|
|
|
}
|
|
|
+ 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 (allDatesOfTwoTimes.size() == 2) {
|
|
|
+ nowDate = endDate;
|
|
|
+ lastDate = startDate;
|
|
|
+ } else if (allDatesOfTwoTimes.size() == 1) {
|
|
|
+ nowDate = startDate;
|
|
|
+ lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 日期 -1
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if ("2".equals(mediaId)) {
|
|
|
- return kuaishouItemCollectSamplesService.getKsGmvHour(userId, type, mediaId);
|
|
|
- } else if("1".equals(mediaId)){
|
|
|
- return kuaishouItemCollectSamplesService.getBytedanceGmvHour(userId, type, mediaId);
|
|
|
+ return kuaishouItemCollectSamplesService.getKsGmvHour(userId, type, mediaId, nowDate, lastDate);
|
|
|
+ } else if ("1".equals(mediaId)) {
|
|
|
+ return kuaishouItemCollectSamplesService.getBytedanceGmvHour(userId, type, mediaId, nowDate, lastDate);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|