Bläddra i källkod

Merge remote-tracking branch 'origin/test' into test

syh 5 år sedan
förälder
incheckning
7e9b254f50

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/ureport/ServletConfig.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ImportResource;
 import javax.servlet.Servlet;
 
 @Configuration
-@ImportResource("classpath:ureport-console-context.xml")
+//@ImportResource("classpath:ureport-console-context.xml")
 public class ServletConfig {
 
     @Bean

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/job/KuaishouReportAgentJob.java

@@ -31,9 +31,9 @@ public class KuaishouReportAgentJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         String currentDate = DateUtils.formatDate(DateUtils.addDay(new Date(),-1));
-        kuaishouReportDailyAgentService.getReport(currentDate,currentDate);
+        kuaishouReportDailyAgentService.getReport(currentDate,DateUtils.getNowDate("yyyy-MM-dd"));
 
-        //kuaishouReportDailyAgentService.getReport("2019-01-01","2019-12-12");
+//        kuaishouReportDailyAgentService.getReport("2019-12-12","2020-03-05");
 
     }
 }

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

@@ -188,7 +188,7 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
             while(DateUtils.compareDate(currentDate,endDate)<=0){
                 //{"agentId":403756224,"startDate":"2020-03-05","endDate":"2020-03-05","sortKey":"","isAscending":false,"pageInfo":{"pageSize":19,"currentPage":1,"totalCount":100}}
                 String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/data/list";
-                String postData = "{\"agentId\":403756224,\"startDate\":\""+currentDate+"\",\"endDate\":\""+currentDate+"\",\"isAscending\":false,\"pageInfo\":{\"pageSize\":19,\"currentPage\":1,\"totalCount\":100}}";
+                String postData = "{\"agentId\":403756224,\"startDate\":\""+currentDate+"\",\"endDate\":\""+currentDate+"\",\"isAscending\":false,\"pageInfo\":{\"pageSize\":19,\"currentPage\":1,\"totalCount\":999999}}";
                 String result = HttpUtils2.httpPostRequestTest(listUrl,postData,headerMap);
                 ObjectMapper mapper = new ObjectMapper();
                 JsonNode resultNode = mapper.readTree(result);

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/userefficientvideomap/mapper/xml/UserEfficientVideoMapMapper.xml

@@ -482,7 +482,7 @@
         left join ctop_bytedance_creative b on a.creative_id = b.id
         left join ctop_bytedance_video_info c on b.video_id = c.id
         left join ctop_material_info d on c.signature = d.code
-        left join ctop_material_ascription e on on d.id = e.material_id
+        left join ctop_material_ascription e on d.id = e.material_id
         left join sys_user f1 on e.clip_id = f1.id
         left join sys_user f2 on e.shot_id = f2.id
         left join sys_user f3 on e.plan_id = f3.id
@@ -494,7 +494,7 @@
         date_format(d.create_time, '%Y-%m-%d') &gt;= #{startDate} and
         date_format(d.update_time, '%Y-%m-%d') &lt;= #{endDate}
         group by c.signature
-        having sum(a.charge) >= 5000
+        having sum(a.cost) >= 5000
     </select>
 
     <!-- 头条根据plan_id获取视频总消耗 -->