百伦帐号同步

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

@@ -94,7 +94,6 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                                     DcBaseFinanceAmazonAdProduct dcBaseFinanceAmazonAdProduct = dcBaseFinanceAmazonAdProductMapper.selectOneByExample(example);
                                     if (dcBaseFinanceAmazonAdProduct == null) {
                                         dcBaseFinanceAmazonAdProduct = new DcBaseFinanceAmazonAdProduct();
-
                                     }
                                     BeanUtils.copyProperties(dcBaseFinanceAmazonAdProduct, amazonAdProduct);
                                     dcBaseFinanceAmazonAdProduct.setAccountId(jobAmazonAdLog.getAccountId());
@@ -103,7 +102,12 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
                                     dcBaseFinanceAmazonAdProduct.setExchangeRate(CallBailunSystem.getExchangeRate(dcBaseFinanceAmazonAdProduct.getCurrency(), CurrencyType.CNY.value(), jobAmazonAdLog.getReportDate().atStartOfDay()));
                                     dcBaseFinanceAmazonAdProduct.setExchangeRateUsd(CallBailunSystem.getExchangeRate(dcBaseFinanceAmazonAdProduct.getCurrency(), CurrencyType.USD.value(), jobAmazonAdLog.getReportDate().atStartOfDay()));
                                     dcBaseFinanceAmazonAdProduct.setBjModifyTime(LocalDateTime.now());
-                                    dcBaseFinanceAmazonAdProductMapper.upsert(dcBaseFinanceAmazonAdProduct);
+
+                                    if (dcBaseFinanceAmazonAdProduct.getId() == null) {
+                                        dcBaseFinanceAmazonAdProductMapper.insertSelective(dcBaseFinanceAmazonAdProduct, null);
+                                    } else {
+                                        dcBaseFinanceAmazonAdProductMapper.updateByPrimaryKeySelective(dcBaseFinanceAmazonAdProduct);
+                                    }
                                 }
                             }
                         }

data-base/base-sync-company/src/main/resources/const.properties

 #COMPANY_INFO_URL=http://sso.bailuntec.com/GetCompanys
 #COMPANY_STAFF_URL=http://sso.bailuntec.com/GetUserByCompany
-#COMPANY_ACCOUNT_URL=http://pams.bailuntec.com/Api/GetAccountToken
+COMPANY_ACCOUNT_URL=http://pams.bailuntec.com/Api/GetAccountToken
 COMPANY_INFO_URL=http://172.31.255.10/GetCompanys
 COMPANY_STAFF_URL=http://172.31.255.10/GetUserByCompany
-COMPANY_ACCOUNT_URL=http://10.0.6.17:8090/Api/GetAccountToken
+#COMPANY_ACCOUNT_URL=http://10.0.6.17:8090/Api/GetAccountToken
 PAYPAL_ACCOUNT_URL=http://pams.bailuntec.com/Api/GetPayPalAccounts
 

data-base/base-sync-company/src/main/resources/job.properties

 #EVENT_RDB_STORAGE_URL=jdbc:mysql://192.168.6.140:3306/bailun_datacenter?serverTimezone=GMT%2B8&characterEncoding=utf-8
 #EVENT_RDB_STORAGE_USERNAME=root
 #EVENT_RDB_STORAGE_PASSWORD=123456
-#ZOOKEEPER_SERVER=127.0.0.1:2181
+ZOOKEEPER_SERVER=127.0.0.1:2181
 EVENT_RDB_STORAGE_DRIVER=com.mysql.jdbc.Driver
 EVENT_RDB_STORAGE_URL=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
 EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 
 
-ZOOKEEPER_SERVER=172.31.255.120:2181
+#ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
 
 JOB_NAME_COMPANY_INFO=base-sync-company-info