Browse Source

合并冲突

hcst_sunzhen 5 years ago
parent
commit
0553a68584

+ 0 - 2
module-report/src/main/java/cn/com/ctop/bytedance/service/IReportService.java

@@ -18,8 +18,6 @@ public interface IReportService {
 
     void getAdvertiserReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl);
 
-    void getAdvertiserCampaignReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL);
-
     void getCampaignReportByPage(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl, Integer pageNum);
 
     void getAdvertiserPlanReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL);

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

@@ -21,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -71,6 +72,10 @@ public class ReportServiceImpl implements IReportService {
         getAdvertiserReportByPage(token, conditions, 1);
     }
 
+    @Override
+    public void getCampaignReportByPage(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl, Integer pageNum) {
+    }
+
     private void getAdvertiserReportByPage(CtopOauthToken token, ByteDanceAdvertiserReportDTO conditions, Integer page) {
         conditions.setPage(page);
         SerializeConfig config = new SerializeConfig();
@@ -264,12 +269,6 @@ public class ReportServiceImpl implements IReportService {
         getCreativeReportByPage(token, conditions, 1);
     }
 
-    @Override
-    public void getAdvertiserCreativeReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
-        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePl);
-        getCreativeReportByPage(token, conditions, 1);
-    }
-
 
     public JSONObject getMaterialReport(CtopOauthToken token, String startDate, String endDate, Integer pageNum) {
         // 请求地址