Browse Source

分时数据 添加时间区间

zhaoxian 1 year ago
parent
commit
70dccf1dd0

+ 21 - 5
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -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();

+ 4 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemCollectSamplesService.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress;
 import com.ruixuan.isc.entity.KuaishouItemCollectSampleLog;
 import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -118,8 +120,8 @@ public interface IKuaishouItemCollectSamplesService {
 
     JSONObject getOrderHourData( String mediaId);
 
-    JSONObject getKsGmvHour(Long userId, String type, String mediaId);
+    JSONObject getKsGmvHour(Long userId, String type, String mediaId,String nowDate,String lastDate);
 
-    JSONObject getBytedanceGmvHour(Long userId, String type, String mediaId);
+    JSONObject getBytedanceGmvHour(Long userId, String type, String mediaId,String nowDate,String lastDate);
 }
 

+ 2 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -779,10 +779,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
     }
 
     @Override
-    public JSONObject getKsGmvHour(Long userId, String type, String mediaId) {
+    public JSONObject getKsGmvHour(Long userId, String type, String mediaId,String nowDate,String lastDate){
         JSONObject returnJson = new JSONObject();
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");   // 当天
-        String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);  //  日期 -1
         String roleKey = userService.getRoleKeyByUserId(userId);
         List<Long> userList = null;
         if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey) || "associationManager".equals(roleKey)) {
@@ -813,10 +811,8 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
     }
 
     @Override
-    public JSONObject getBytedanceGmvHour(Long userId, String type, String mediaId) {
+    public JSONObject getBytedanceGmvHour(Long userId, String type, String mediaId,String nowDate,String lastDate) {
         JSONObject returnJson = new JSONObject();
-        String nowDate = DateUtils.getNowDate("yyyy-MM-dd");   // 当天
-        String lastDate = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);  //  日期 -1
 
         Long dataNow = Long.valueOf(nowDate.replace("-", ""));
         Long lastDateNow = Long.valueOf(lastDate.replace("-", ""));