Przeglądaj źródła

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

xuzuoyun 5 lat temu
rodzic
commit
8cbb53d3e1

+ 0 - 4
module-report/src/main/java/cn/com/ctop/bytedance/aa.java

@@ -1,4 +0,0 @@
-package cn.com.ctop.bytedance;
-
-public class aa {
-}

+ 9 - 1
module-report/src/main/java/cn/com/ctop/bytedance/mapper/BytedanceCampaignDailyReportMapper.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.bytedance.mapper;
 
 import cn.com.ctop.bytedance.entity.BytedanceCampaignDailyReport;
+import cn.com.ctop.bytedance.vo.ReportVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description: 广告组日报表信息
@@ -10,5 +12,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface BytedanceCampaignDailyReportMapper extends BaseMapper<BytedanceCampaignDailyReport> {
-
+    /**
+     * 今日消耗
+     *
+     * @param date
+     * @return
+     */
+    ReportVO selectDayReport(@Param("date") String date);
 }

+ 2 - 4
module-report/src/main/java/cn/com/ctop/bytedance/mapper/ReportMapper.java

@@ -2,13 +2,11 @@ package cn.com.ctop.bytedance.mapper;
 
 
 import com.alibaba.fastjson.JSONObject;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
-public interface ReportMapper {
+public interface BytedanceReportMapper {
 
     /**
      * 今日消耗
@@ -16,7 +14,7 @@ public interface ReportMapper {
      * @param date
      * @return
      */
-    JSONObject selectDayReport(@Param("date") String date);
+    //   ReportVO selectDayReport(@Param("date") String date);
 
     /**
      * 查询明细

+ 10 - 1
module-report/src/main/java/cn/com/ctop/bytedance/mapper/xml/BytedanceCampaignDailyReportMapper.xml

@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.bytedance.mapper.BytedanceCampaignDailyReportMapper">
-
+    <select id="selectDayReport" resultMap="cn.com.ctop.bytedance.vo.ReportVO">
+      select
+       sum(charge) cost,
+       sum(photo_show) photoShow,
+       sum(photo_click) photoClick,
+       sum(aclick) aclick
+     from
+      ctop_kuaishou_report_hourly_account
+      where stat_date = #{date}
+    </select>
 </mapper>

+ 13 - 12
module-report/src/main/java/cn/com/ctop/bytedance/mapper/xml/ReportMapper.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.bytedance.mapper.ReportMapper">
-
-    <select id="selectDayReport" resultType="com.alibaba.fastjson.JSONObject">
-      select
-       sum(charge) cost,
-       sum(photo_show) photoShow,
-       sum(photo_click) photoClick,
-       sum(aclick) aclick
-     from
-      ctop_kuaishou_report_hourly_account
-      where stat_date = #{date}
-    </select>
+<mapper namespace="cn.com.ctop.bytedance.mapper.BytedanceReportMapper">
+
+
+    <!--  <select id="selectDayReport" resultType="cn.com.ctop.bytedance.vo.ReportVO">
+        select
+         sum(charge) cost,
+         sum(photo_show) photoShow,
+         sum(photo_click) photoClick,
+         sum(aclick) aclick
+       from
+        ctop_kuaishou_report_hourly_account
+        where stat_date = #{date}
+      </select>-->
 
     <select id="selectYesterday" resultType="com.alibaba.fastjson.JSONObject">
       select

+ 11 - 3
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/BytedanceReportServiceImpl.java

@@ -2,8 +2,10 @@ package cn.com.ctop.bytedance.service.impl;
 
 import cn.com.ctop.bytedance.entity.BytedanceAdvertiserDailyReport;
 import cn.com.ctop.bytedance.mapper.BytedanceAdvertiserDailyReportMapper;
-import cn.com.ctop.bytedance.mapper.ReportMapper;
+import cn.com.ctop.bytedance.mapper.BytedanceCampaignDailyReportMapper;
+import cn.com.ctop.bytedance.mapper.BytedanceReportMapper;
 import cn.com.ctop.bytedance.service.IBytedanceReportService;
+import cn.com.ctop.bytedance.vo.ReportVO;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.utils.Check;
@@ -30,7 +32,7 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
     private BytedanceAdvertiserDailyReportMapper bytedanceAdvertiserDailyReportMapper;
 
     @Autowired
-    private ReportMapper reportMapper;
+    private BytedanceReportMapper reportMapper;
 
     @Autowired
     private KuaishouReportDailyAccountMapper kuaishouReportDailyAccountMapper;
@@ -194,6 +196,9 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
      * @param requestJson
      * @return
      */
+    @Autowired
+    private BytedanceCampaignDailyReportMapper campaignDailyReportMapper;
+
     @Override
     public JSONObject getKuaiShouAccountReport(JSONObject requestJson) {
         Integer type = requestJson.getInteger("type");
@@ -203,7 +208,10 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
             String nowDate = DateUtils.getNowDate("yyyy-MM-dd"); // 当前日期
             String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 当前日期-1
             if (type == 1) { // 今日总消耗
-                accountJson = reportMapper.selectDayReport(nowDate);
+                ReportVO reportVO = campaignDailyReportMapper.selectDayReport(nowDate);
+                System.err.println("12312312313131313131313131313131");
+                System.err.println(reportVO.toString());
+                System.err.println("----------------------------------------------");
                 JSONObject yesterJson = reportMapper.selectYesterday(anotherDay);
                 if (!Check.isNull(yesterJson)) {
                     BigDecimal cost = accountJson.getBigDecimal("cost"); // 今日消耗

+ 1 - 0
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/ReportServiceImpl.java

@@ -73,6 +73,7 @@ public class ReportServiceImpl implements IReportService {
     @Autowired
     private IBytedanceCreativeHourlyReportService creativeHourlyReportService;
 
+
     @Override
     public Map<String, Object> getAdvertiserReport(ByteDanceAdvertiserReportDTO conditions) {
         conditions.setAdvertiserId(111463131228L);

+ 26 - 0
module-report/src/main/java/cn/com/ctop/bytedance/vo/ReportVO.java

@@ -0,0 +1,26 @@
+package cn.com.ctop.bytedance.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ReportVO implements Serializable {
+    private BigDecimal cost;
+    private Long photoShow;
+    private Long photoClick;
+    private Long aclick;
+    private String statDate;
+
+    @Override
+    public String toString() {
+        return "ReportVO{" +
+                "cost=" + cost +
+                ", photoShow=" + photoShow +
+                ", photoClick=" + photoClick +
+                ", aclick=" + aclick +
+                ", statDate='" + statDate + '\'' +
+                '}';
+    }
+}