Parcourir la source

Merge remote-tracking branch 'origin/master'

yumeng il y a 8 mois
Parent
commit
bc34b47837

+ 2 - 2
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedanceProjectMapper.xml

@@ -142,11 +142,11 @@
     </select>
 
     <select id="getSpecialProject" resultType="Long">
-        SELECT project_id
+        SELECT IFNULL(project_id,-1)
         FROM `jeecg-boot`.bytedance_refusal_send
         WHERE flag = 1
         UNION
-        SELECT account_id
+        SELECT IFNULL(account_id,-1)
         FROM `jeecg-boot`.bytedance_refusal_send
         WHERE flag = 1
     </select>

+ 10 - 8
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -11,11 +11,9 @@ import cn.com.ctop.job.bytedance.data.entity.BytedanceAdReportHourly;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceAdvertiserReportDaily;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceAdvertiserReportHourly;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceAgentReportDaily;
-import cn.com.ctop.job.bytedance.data.entity.BytedanceCdpProject;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceV3ProjectReportDaily;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceV3ProjectReportHourly;
 import cn.com.ctop.job.bytedance.data.entity.BytedanceV3PromotionProjectReportDaily;
-import cn.com.ctop.job.bytedance.data.entity.MediaSendAlarmRecord;
 import cn.com.ctop.job.bytedance.data.entity.OauthToken;
 import cn.com.ctop.job.bytedance.data.enums.InventoryEnum;
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceAdGetMapper;
@@ -25,11 +23,9 @@ import cn.com.ctop.job.bytedance.data.mapper.BytedanceAdvertiserReportDailyMappe
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceAdvertiserReportHourlyMapper;
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceAgentReportDailyMapper;
 import cn.com.ctop.job.bytedance.data.mapper.BytedanceAgentReportHourlyMapper;
-import cn.com.ctop.job.bytedance.data.mapper.OauthTokenMapper;
 import cn.com.ctop.job.bytedance.data.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.job.bytedance.data.service.IBytedanceAgentReportDailyService;
 import cn.com.ctop.job.bytedance.data.service.IBytedanceAgentReportHourlyService;
-import cn.com.ctop.job.bytedance.data.service.IBytedanceProjectService;
 import cn.com.ctop.job.bytedance.data.utils.Check;
 import cn.com.ctop.job.bytedance.data.utils.DateUtils;
 import cn.com.ctop.job.bytedance.data.utils.HttpUtils;
@@ -50,7 +46,6 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -491,15 +486,22 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
      * @param conditions
      * @return
      */
-    public JSONObject getAdvertiserStat(OauthToken token, JSONObject conditions) {
+    public JSONObject getAdvertiserStat(OauthToken token, JSONObject params) {
         // 请求地址
         String url = bytedanceApiUrl + BytedanceConstant.BYTEDANCE_V2_REPORT_advertiser_GET;
         JSONArray groupBy = new JSONArray();
         groupBy.add("STAT_GROUP_BY_FIELD_ID");
         groupBy.add("STAT_GROUP_BY_FIELD_STAT_TIME");
-        conditions.put("group_by", groupBy);
+        params.put("group_by", groupBy);
 //        System.out.println("入参:" + conditions);
-        return HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, conditions);
+
+        Map<String, String> headers = new HashMap<String, String>();
+        headers.put("Content-Type", "application/json");
+        headers.put("Access-Token", token.getAccessToken());
+
+        String result = HttpUtils.httpGet(url, params, headers);
+        return JSONObject.parseObject(result);
+//      return  JSONObject object = HttpUtils.bytedanceGetRequest(token.getAccessToken(), url, params);
     }
 
     /**

+ 6 - 6
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceProjectServiceImpl.java

@@ -355,12 +355,12 @@ public class BytedanceProjectServiceImpl implements IBytedanceProjectService {
                     msgType.append("已设转化:").append(ocpxMap.get("nameStr")).append("<br/>").append("目标转化:").append(octypeName);
                 } else {
                     //未查询到转化出价,说明出价不一致,触发出价关停。
-                    if (Check.isNull(cpaBid)) {
-                        if (!"NO_BID".equals(bidType)) {
-                            bidFalg = false;
-                            msgBid.append("[").append(octypeName).append("]目标出价为空");
-                        }
-                    } else {
+                    if (!Check.isNull(cpaBid)) {
+//                        if (!"NO_BID".equals(bidType)) {
+//                            bidFalg = false;
+//                            msgBid.append("[").append(octypeName).append("]目标出价为空");
+//                        }
+//                    } else {
                         BigDecimal cpa = new BigDecimal(cpaBid).multiply(new BigDecimal("1000"));
                         BigDecimal ocpx = new BigDecimal(ocpxBid);//本地设置
                         if (cpa.compareTo(ocpx) == 1) {

+ 1 - 1
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/utils/HttpUtils.java

@@ -205,7 +205,7 @@ public class HttpUtils {
         return httpclient;
     }
 
-
+    //GET Query-String
     public static String httpGet(String url, Map<String, Object> paramsMap, Map<String, String> headers) {
         String result = null;
         try {