amazon广告费请求接口、参数更改

data-base/base_sync_finance_amazon/pom.xml

@@ -42,8 +42,6 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>2.9.0</version>
-            <type>jar</type>
             <scope>compile</scope>
         </dependency>
 

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/domain/AmazonAdvert.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -45,6 +46,8 @@ public class AmazonAdvert {
 
     private LocalDateTime gmtCreateTime;
     private LocalDateTime gmtModifyTime;
+    private LocalDate reportDate;
+    private String reportType;
 
 
 

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/job/AdvertAddTaskSyncJob.java

@@ -2,7 +2,7 @@ package com.bailuntec.job;
 
 import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.AccountTokenInfo;
-import com.bailuntec.domain.AmazonAdvert;
+import com.bailuntec.domain.entity.DcBaseFinanceAmazon;
 import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.mapper.DcBaseFinanceAmazonMapper;
 import com.bailuntec.support.PointJob;
@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.apache.commons.lang3.StringUtils;
 import java.io.*;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
@@ -112,18 +113,22 @@ public class AdvertAddTaskSyncJob extends PointJob {
                                     while((str = bufferedReader.readLine()) != null){
                                         sb.append(str);
                                     }
-                                    List<AmazonAdvert> amazonAdverts = JSON.parseArray(sb.toString(), AmazonAdvert.class);
-                                    for(AmazonAdvert amazonAdvert : amazonAdverts) {
-                                        amazonAdvert.setAccountId((Integer) map0.get("Id"));
-                                        // amazonAdvert.setCompanyId(job.getCompanyId());
-                                        try {
-                                            DcBaseFinanceAmazonMapper dcBaseFinanceAmazonMapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonMapper.class);
-                                            dcBaseFinanceAmazonMapper.upsertSelective(amazonAdvert);
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
-                                            throw new RuntimeException("Mybatis操作DB插入任务记录失败,错误详情:" + transform(e));
-                                        } finally {
-                                            SessionUtil.closeSession();
+                                    List<DcBaseFinanceAmazon> amazonAdverts = JSON.parseArray(sb.toString(), DcBaseFinanceAmazon.class);
+                                    for(DcBaseFinanceAmazon amazonAdvert : amazonAdverts) {
+                                        if(BigDecimal.ZERO.compareTo(amazonAdvert.getCost()) == -1) {
+                                            amazonAdvert.setAccountId((Integer) map0.get("Id"));
+                                            amazonAdvert.setCompanyId((Integer) map0.get("UserId"));
+                                            amazonAdvert.setReportDate(localDateTime.toLocalDate());
+                                       //     amazonAdvert.setReportType(reportType);
+                                            try {
+                                                DcBaseFinanceAmazonMapper dcBaseFinanceAmazonMapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonMapper.class);
+                                                dcBaseFinanceAmazonMapper.upsertSelective(amazonAdvert);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                                throw new RuntimeException("Mybatis操作DB插入任务记录失败,错误详情:" + transform(e));
+                                            } finally {
+                                                SessionUtil.closeSession();
+                                            }
                                         }
                                     }
                                     gzin.close();

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/job/AdvertResultSyncJob.java

@@ -33,7 +33,7 @@ public class AdvertResultSyncJob extends PointJob {
 
     @Override
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
-        int totalPage = getCount(jobPointLog);//分片即将处理的账号总数
+       /* int totalPage = getCount(jobPointLog);//分片即将处理的账号总数
         try {
             JobAccountLogMapper jobAccountLogMapper = SessionUtil.getSession().getMapper(JobAccountLogMapper.class);
             int pageSize = totalPage % shardingContext.getShardingTotalCount() == 0 ? totalPage / shardingContext.getShardingTotalCount() : totalPage / shardingContext.getShardingTotalCount() + 1;
@@ -52,9 +52,9 @@ public class AdvertResultSyncJob extends PointJob {
             log.warn("Amazon广告费接口调用错误", e);
         } finally {
             SessionUtil.closeSession();
-        }
+        }*/
     }
-
+/*
     private int getCount(JobPointLog jobPointLog) {
         int i = 0;
         try {
@@ -109,5 +109,5 @@ public class AdvertResultSyncJob extends PointJob {
                 response.close();
             }
         }
-    }
+    }*/
 }

data-base/base_sync_finance_amazon/src/main/java/com/bailuntec/mapper/DcBaseFinanceAmazonMapper.java

 package com.bailuntec.mapper;
 
-import com.bailuntec.domain.AmazonAdvert;
 import com.bailuntec.domain.entity.DcBaseFinanceAmazon;
 import com.bailuntec.domain.example.DcBaseFinanceAmazonExample;
 import org.apache.ibatis.annotations.Param;
@@ -121,5 +120,5 @@ public interface DcBaseFinanceAmazonMapper {
      * @mbg.generated
      * @project https://github.com/itfsw/mybatis-generator-plugin
      */
-    int upsertSelective(AmazonAdvert record);
+    int upsertSelective(DcBaseFinanceAmazon record);
 }
\ No newline at end of file

data-base/base_sync_finance_amazon/src/main/resources/const.properties

 ADDTASK_FINANCE_URL=http://10.0.3.5:18321/outer/addtask
 GETRESULT_FINANCE_URL=http://10.0.3.5:18321/outer/getresult
 ACCOUNT_API=http://pams.bailuntec.com/Api/GetAccountToken?platform=Amazon
-CAMPAIGNS_REPORT=https://advertising-api.amazon.com/v2/sp/campaigns/report
+CAMPAIGNS_REPORT=https://advertising-api.amazon.com/v2/sp/productAds/report
+#HSA_CAMPAIGNS_REPORT=https://advertising-api.amazon.com/v2/hsa/campaigns/report
 V2_REPORTS=https://advertising-api.amazon.com/v2/reports/
 WARN_API=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b4655a50-927a-4c3c-87ad-a900e54dcc8e
 #METRICS=campaignName,campaignId,campaignStatus,campaignBudget,attributedConversions1d,attributedUnitsOrdered1d,attributedSales1d,attributedUnitsOrdered7d,attributedSales1d,impressions,clicks,cost,attributedConversions30d,attributedConversions14d,attributedConversions7d,attributedSales30d,attributedSales14d,attributedSales7d
-METRICS=campaignName,campaignId,cost,currency,campaignStatus,campaignBudget,cost
-
+METRICS=campaignName,campaignId,adGroupName,adGroupId,impressions,clicks,cost,currency,asin,sku,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
+#METRICS=campaignName,campaignId,cost,campaignStatus,campaignBudget,currency