广告！！！！！

data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdDownloadReportJob.java

@@ -82,7 +82,7 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                             }.getType();
                             List<AmazonAdProduct> amazonAdProductList = JSON.parseObject(gzipInputStream, type);
                             for (AmazonAdProduct amazonAdProduct : amazonAdProductList) {
-                                if (amazonAdProduct.getCost() != null && BigDecimal.ZERO.compareTo(amazonAdProduct.getCost()) != 0) {
+                                if (amazonAdProduct.getCost() != null && BigDecimal.ZERO.compareTo(amazonAdProduct.getCost()) < 0) {
 
                                     DcBaseFinanceAmazonAdProductExample example = DcBaseFinanceAmazonAdProductExample.newAndCreateCriteria()
                                             .andCompanyIdEqualTo(jobAmazonAdLog.getCompanyId())
@@ -91,6 +91,7 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                                             .andCampaignIdEqualTo(amazonAdProduct.getCampaignId())
                                             .andAdGroupIdEqualTo(amazonAdProduct.getAdGroupId())
                                             .andTypeEqualTo(jobAmazonAdLog.getType())
+                                            .andSkuEqualTo(amazonAdProduct.getSku())
                                             .example();
 
                                     DcBaseFinanceAmazonAdProduct dcBaseFinanceAmazonAdProduct = dcBaseFinanceAmazonAdProductMapper.selectOneByExample(example);
@@ -106,11 +107,8 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                                     dcBaseFinanceAmazonAdProduct.setBjModifyTime(LocalDateTime.now());
                                     dcBaseFinanceAmazonAdProduct.setType(jobAmazonAdLog.getType());
 
-                                    if (dcBaseFinanceAmazonAdProduct.getId() == null) {
-                                        dcBaseFinanceAmazonAdProductMapper.insertSelective(dcBaseFinanceAmazonAdProduct, null);
-                                    } else {
-                                        dcBaseFinanceAmazonAdProductMapper.updateByPrimaryKeySelective(dcBaseFinanceAmazonAdProduct);
-                                    }
+
+                                    dcBaseFinanceAmazonAdProductMapper.upsertSelective(dcBaseFinanceAmazonAdProduct);
                                 }
                             }
 

data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdGenerateReportIdJob.java

@@ -46,16 +46,18 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
 
 
             dcBaseCompanyAccountList
-//                    .stream()
-//                    .filter(dcBaseCompanyAccount -> dcBaseCompanyAccount.getAccountId() == 671)
+                    .stream()
+                    .filter(dcBaseCompanyAccount -> dcBaseCompanyAccount.getAccountId() == 671)
                     .forEach(dcBaseCompanyAccount -> {
 
                         //productAds
 
+                        for (int i = 24; i <= 31; i++) {
+                            LocalDateTime reportDate = LocalDateTime.of(2020, 8, i, 0, 0);
                             try {
 //                            LocalDateTime reportDate = LocalDateTime.of(2020, 8, 30, 0, 0);
 
-                            LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
+//                                LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
                                 JSONObject jsonObject = new JSONObject();
                                 jsonObject.put("reportDate", reportDate.format(DateTimeFormatter.ofPattern("yyyyMMdd")));
                                 jsonObject.put("metrics", propertiesUtil.getPropertyAsString("METRICS"));
@@ -126,7 +128,7 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
                             try {
                                 AmazonAdAuth amazonAdAuth = JSON.parseObject(dcBaseCompanyAccount.getAmazonAdAuthJson(), AmazonAdAuth.class);
 
-                            LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
+//                                LocalDateTime reportDate = LocalDateTime.now().minusDays(1).minusHours(12);
 
 //                            LocalDateTime reportDate = LocalDateTime.of(2020, 9, 1, 0, 0);
 
@@ -190,6 +192,10 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
                             } catch (Exception e) {
                                 log.error(e.getMessage(), e);
                             }
+
+                        }
+
+
                     });
         }
 

data-base/base-sync-amazon-ad/src/main/resources/const.properties

 NA_URL=https://advertising-api.amazon.com
 EU_URL=https://advertising-api-eu.amazon.com
 FE_URL=https://advertising-api-fe.amazon.com
+
 POST_PRODUCT_ADS_REPORT_ID=/v2/sp/productAds/report
 GET_PRODUCT_ADS_REPORT_LOCATION=/v2/reports/
 GET_PRODUCT_ADS_REPORT_DOWNLOAD_PREFIX=/v1/reports/
 GET_PRODUCT_ADS_REPORT_DOWNLOAD_SUFFIX=/download
+
 WARN_API=https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b4655a50-927a-4c3c-87ad-a900e54dcc8e
 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
 
+w

data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceAmazonAdProductMapper.java

@@ -4,9 +4,8 @@ import com.bailuntec.domain.dto.DcBaseFinanceAmazonItemDto;
 import com.bailuntec.domain.entity.DcBaseFinanceAmazonAdProduct;
 import com.bailuntec.domain.entity.JobPointLog;
 import com.bailuntec.domain.example.DcBaseFinanceAmazonAdProductExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface DcBaseFinanceAmazonAdProductMapper {
     /**
@@ -47,7 +46,7 @@ public interface DcBaseFinanceAmazonAdProductMapper {
      *
      * @mbg.generated
      */
-    int insertSelective(@Param("record") DcBaseFinanceAmazonAdProduct record, @Param("shardParam") String shardParam);
+    int insertSelective(DcBaseFinanceAmazonAdProduct record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -80,7 +79,7 @@ public interface DcBaseFinanceAmazonAdProductMapper {
      *
      * @mbg.generated
      */
-    int updateByExampleSelective(@Param("record") DcBaseFinanceAmazonAdProduct record, @Param("example") DcBaseFinanceAmazonAdProductExample example, @Param("shardParam") String shardParam);
+    int updateByExampleSelective(@Param("record") DcBaseFinanceAmazonAdProduct record, @Param("example") DcBaseFinanceAmazonAdProductExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -124,5 +123,6 @@ public interface DcBaseFinanceAmazonAdProductMapper {
      */
     int upsertSelective(DcBaseFinanceAmazonAdProduct record);
 
+
     List<DcBaseFinanceAmazonItemDto> selectAmazonItem(JobPointLog jobPointLog);
 }

data-common/src/main/resources/init.properties

-table-name=dc_daily_sales
+table-name=dc_base_finance_amazon_ad_product