Browse Source

测试自动化部署

yumeng 6 years ago
parent
commit
cb03730194

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

@@ -2,6 +2,7 @@ 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.BytedanceReportMapper;
 import cn.com.ctop.bytedance.service.IBytedanceReportService;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
@@ -22,18 +23,18 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
     @Autowired
     private BytedanceAdvertiserDailyReportMapper bytedanceAdvertiserDailyReportMapper;
 
+    @Autowired
+    private BytedanceReportMapper bytedanceReportMapper;
+
     /**
-     * 获取 媒体昨日总消耗
+     *媒体昨日总消耗
      *
      * @param loginId
      * @return
      */
     @Override
     public JSONObject getCost(String loginId) {
-
         JSONObject returnJson = new JSONObject();
-
-
         QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", loginId);
         queryWrapper.eq("media_id", 1);
@@ -50,25 +51,30 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
             Long byteDanceNextDayOpen = 0L;
             Long byteDanceActive = 0L;
             for (UserAllocation userAllocation : userAllocations) {
-                QueryWrapper<BytedanceAdvertiserDailyReport> bytedanceAdvertiserDailyReportQueryWrapper = new QueryWrapper<>();
-                bytedanceAdvertiserDailyReportQueryWrapper.eq("advertiser_id", userAllocation.getAccountId());
-                //   Map<String, Object> beforeDate = DateUtils.getBeforeDate();
-                //  bytedanceAdvertiserDailyReportQueryWrapper.between("stat_datetime", beforeDate.get("startDate"), beforeDate.get("endDate"));
-                bytedanceAdvertiserDailyReportQueryWrapper.between("stat_datetime", "2019-07-01 00:00:00", "2019-07-01 23:59:59");
-                bytedanceAdvertiserDailyReportQueryWrapper.orderByDesc("create_time");
-                bytedanceAdvertiserDailyReportQueryWrapper.last("limit 1");
-                BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport = bytedanceAdvertiserDailyReportMapper.selectOne(bytedanceAdvertiserDailyReportQueryWrapper);
 
-                if (!Check.isNull(bytedanceAdvertiserDailyReport)) {
-                    byteDanceCost = byteDanceCost.add(bytedanceAdvertiserDailyReport.getCost());
-                    byteDanceClick += bytedanceAdvertiserDailyReport.getClick();
-                    byteDanceShow += bytedanceAdvertiserDailyReport.getShowNum();
-                    byteDanceConvert += bytedanceAdvertiserDailyReport.getConvertNum();
-                    byteDanceForm += bytedanceAdvertiserDailyReport.getForm();
-                    byteDanceNextDayOpen += bytedanceAdvertiserDailyReport.getNextDayOpen();
-                    byteDanceActive += bytedanceAdvertiserDailyReport.getActive();
-                }
+                if ("1".equals(userAllocation.getMediaId())) {
+                    QueryWrapper<BytedanceAdvertiserDailyReport> bytedanceAdvertiserDailyReportQueryWrapper = new QueryWrapper<>();
+                    bytedanceAdvertiserDailyReportQueryWrapper.eq("advertiser_id", userAllocation.getAccountId());
+                    //   Map<String, Object> beforeDate = DateUtils.getBeforeDate();
+                    //  bytedanceAdvertiserDailyReportQueryWrapper.between("stat_datetime", beforeDate.get("startDate"), beforeDate.get("endDate"));
+                    bytedanceAdvertiserDailyReportQueryWrapper.between("stat_datetime", "2019-07-01 00:00:00", "2019-07-01 23:59:59");
+                    bytedanceAdvertiserDailyReportQueryWrapper.orderByDesc("create_time");
+                    bytedanceAdvertiserDailyReportQueryWrapper.last("limit 1");
+                    BytedanceAdvertiserDailyReport bytedanceAdvertiserDailyReport = bytedanceAdvertiserDailyReportMapper.selectOne(bytedanceAdvertiserDailyReportQueryWrapper);
+                    if (!Check.isNull(bytedanceAdvertiserDailyReport)) {
+                        byteDanceCost = byteDanceCost.add(bytedanceAdvertiserDailyReport.getCost());
+                        byteDanceClick += bytedanceAdvertiserDailyReport.getClick();
+                        byteDanceShow += bytedanceAdvertiserDailyReport.getShowNum();
+                        byteDanceConvert += bytedanceAdvertiserDailyReport.getConvertNum();
+                        byteDanceForm += bytedanceAdvertiserDailyReport.getForm();
+                        byteDanceNextDayOpen += bytedanceAdvertiserDailyReport.getNextDayOpen();
+                        byteDanceActive += bytedanceAdvertiserDailyReport.getActive();
+                    }
+
+                } else if ("2".equals(userAllocation.getMediaId())) {
+                    // 查询快手相关报表数据
 
+                }
             }
             bytedanceJson.put("cost", byteDanceCost); // 总消耗
             bytedanceJson.put("click", byteDanceClick); // 总点击
@@ -78,7 +84,6 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
             bytedanceJson.put("nextDayOpen", byteDanceNextDayOpen); // 总次留数
             bytedanceJson.put("active", byteDanceActive); // 总激活
 
-
             returnJson.put("bytedance", bytedanceJson);
             System.err.println(returnJson);