ebay费用修改

data-base/base-sync-finance-ebay/pom.xml

@@ -28,6 +28,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.linus87</groupId>
+            <artifactId>ebaycalls</artifactId>
+            <version>1065</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

data-base/base-sync-finance-ebay/src/main/java/com/bailuntec/Application.java

 package com.bailuntec;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.bailuntec.job.EbayFinanceSyncJob;
+
+import com.bailuntec.job.EbayFinanceAdSyncJob;
 import com.bailuntec.utils.PropertiesUtil;
 import com.dangdang.ddframe.job.config.JobCoreConfiguration;
 import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration;
@@ -35,7 +36,7 @@ public class Application {
 
     private static LiteJobConfiguration createJobConfiguration1() {
         JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME"), propertiesUtil.getPropertyAsString("JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
-        SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, EbayFinanceSyncJob.class.getCanonicalName());
+        SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, EbayFinanceAdSyncJob.class.getCanonicalName());
         LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build();
         return simpleJobRootConfig;
     }

data-base/base-sync-finance-ebay/src/main/java/com/bailuntec/job/EbayFinanceAdSyncJob.java

+package com.bailuntec.job;
+
+import com.bailuntec.domain.entity.DcBaseCompanyAccount;
+import com.bailuntec.domain.entity.DcBaseFinanceEbay;
+import com.bailuntec.domain.entity.JobAccountLog;
+import com.bailuntec.domain.entity.JobPointLog;
+import com.bailuntec.domain.enumerate.CurrencyType;
+import com.bailuntec.domain.example.DcBaseCompanyAccountExample;
+import com.bailuntec.domain.example.JobAccountLogExample;
+import com.bailuntec.mapper.DcBaseCompanyAccountMapper;
+import com.bailuntec.mapper.DcBaseFinanceEbayMapper;
+import com.bailuntec.mapper.JobAccountLogMapper;
+import com.bailuntec.support.CallBailunSystem;
+import com.bailuntec.support.PointJob;
+import com.bailuntec.utils.SessionUtil;
+import com.dangdang.ddframe.job.api.ShardingContext;
+import com.ebay.sdk.ApiContext;
+import com.ebay.sdk.ApiCredential;
+import com.ebay.sdk.TimeFilter;
+import com.ebay.sdk.call.GetAccountCall;
+import com.ebay.soap.eBLBaseComponents.AccountEntryType;
+import com.ebay.soap.eBLBaseComponents.AccountHistorySelectionCodeType;
+import com.ebay.soap.eBLBaseComponents.DetailLevelCodeType;
+import com.ebay.soap.eBLBaseComponents.PaginationType;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+public class EbayFinanceAdSyncJob extends PointJob {
+
+    @Override
+    public void executeJob(ShardingContext shardingContext, JobPointLog 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;
+            //拿到账号集合
+            List<JobAccountLog> listByPage = jobAccountLogMapper.getListByPageEbay(12,pageSize * shardingContext.getShardingItem(), pageSize);
+            if (listByPage != null && listByPage.size() > 0) {
+                LocalDateTime now = LocalDateTime.now();
+
+                for (JobAccountLog jobAccountLog : listByPage) {
+                    log.warn("分片: " + shardingContext.getShardingItem() + " 账号: " + jobAccountLog);
+                    if (jobAccountLog.getId() == null) { //在任务表无记录
+                         BeanUtils.copyProperties(jobAccountLog, jobPointLog);
+                        jobAccountLog.setId(null);
+                    }
+                    if(!jobAccountLog.getStartTime().isAfter(LocalDateTime.now().withHour(0).withMinute(0).withSecond(0))) {
+                        callSaasApi(jobAccountLog);
+                    }
+                    if (jobAccountLog.getId() == null) { //在任务表无记录
+                        jobAccountLogMapper = SessionUtil.getSession().getMapper(JobAccountLogMapper.class);
+                        jobAccountLogMapper.insertSelective(jobAccountLog);
+                    } else {
+                        jobAccountLogMapper = SessionUtil.getSession().getMapper(JobAccountLogMapper.class);
+                        jobAccountLog.setBjModified(LocalDateTime.now());
+                        jobAccountLogMapper.updateByExampleSelective(jobAccountLog,JobAccountLogExample.newAndCreateCriteria().andAccountIdEqualTo(jobAccountLog.getAccountId()).andJobNameEqualTo(jobAccountLog.getJobName()).example());
+                    }
+                }
+            }
+            jobPointLog.setStartTime(jobPointLog.getStartTime().plusDays(1));
+            jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(1));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.warn("Ebay定时同步费用接口错误",e);
+        }  finally {
+            SessionUtil.closeSession();
+        }
+    }
+
+    private int getCount(JobPointLog jobPointLog)  {
+        int i = 0;
+        try {
+            DcBaseCompanyAccountMapper accountMapper = SessionUtil.getSession().getMapper(DcBaseCompanyAccountMapper.class);
+            i = (int)accountMapper.countByExample(DcBaseCompanyAccountExample.newAndCreateCriteria().andPlatformIdEqualTo(12).andCompanyIdEqualTo(1).andAccountNameNotLike("%test%").example());
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            SessionUtil.closeSession();
+        }
+        return i;
+    }
+
+    public void callSaasApi(JobAccountLog jobAccountLog)   {
+
+        try{
+            DcBaseCompanyAccount dcBaseCompanyAccount = getToken(jobAccountLog);
+            ApiContext apiContext = getApiContext(dcBaseCompanyAccount.getSoapAuthToken());
+            GetAccountCall getAccountCall = new GetAccountCall(apiContext);
+            getAccountCall.setDetailLevel(new DetailLevelCodeType[]{DetailLevelCodeType.RETURN_ALL});
+            AccountHistorySelectionCodeType accountHistorySelectionCodeType = AccountHistorySelectionCodeType.BETWEEN_SPECIFIED_DATES;
+            //       AccountEntrySortTypeCodeType accountEntrySortTypeCodeType = AccountEntrySortTypeCodeType.ACCOUNT_ENTRY_ITEM_NUMBER_ASCENDING;
+            getAccountCall.setViewType(accountHistorySelectionCodeType);
+            //       getAccountCall.setAccountEntrySortType(accountEntrySortTypeCodeType);
+            ZoneId zone = ZoneId.systemDefault();
+            Calendar cal = Calendar.getInstance();
+            Calendar cal1 = Calendar.getInstance();
+            Instant instant = jobAccountLog.getStartTime().atZone(zone).toInstant();
+            Date date = Date.from(instant);
+            cal.setTime(date);
+
+            Instant instant1 = jobAccountLog.getEndTime().atZone(zone).toInstant();
+            Date date1 = Date.from(instant1);
+            cal1.setTime(date1);
+
+            TimeFilter timeFilter = new TimeFilter(cal, cal1);
+            getAccountCall.setViewPeriod(timeFilter);
+            getAccountCall.setInvoiceDate(cal);
+
+            getAccountInfo(getAccountCall, dcBaseCompanyAccount, jobAccountLog);
+
+        }catch (Exception e){
+            jobAccountLog.setMessage("执行失败"+ e);
+        }
+    }
+
+    public void getAccountInfo(GetAccountCall getAccountCall, DcBaseCompanyAccount dcBaseCompanyAccount, JobAccountLog jobAccountLog) throws Exception {
+        PaginationType paginationType = new PaginationType();
+
+        Integer pageIndex = 1;
+        try{
+        do {
+            paginationType.setPageNumber(pageIndex);
+            getAccountCall.setPagination(paginationType);
+                final AccountEntryType[] entries = getAccountCall.getAccount();
+                if(entries != null){
+                    DcBaseFinanceEbay dcBaseFinanceEbay = new DcBaseFinanceEbay();
+
+                    for (AccountEntryType accountEntry : entries) {
+                        System.out.println(accountEntry.getDate().getTime().toString());
+                        ZoneId zone = ZoneId.systemDefault();
+                        LocalDateTime gmt = LocalDateTime.ofInstant(accountEntry.getDate().getTime().toInstant(), zone);
+                        //    LocalDateTime gmt = LocalDateTime.from(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(accountEntry.getDate().getTime()));
+                        dcBaseFinanceEbay.setGmtDate(gmt);
+                        dcBaseFinanceEbay.setBjDate(dcBaseFinanceEbay.getGmtDate().minusHours(15L));
+                        dcBaseFinanceEbay.setAccountEntryType(accountEntry.getAccountDetailsEntryType().value());
+                        dcBaseFinanceEbay.setVatPercent(accountEntry.getVATPercent());
+                        dcBaseFinanceEbay.setItemId(accountEntry.getItemID());
+                        dcBaseFinanceEbay.setTransactionId(accountEntry.getTransactionID());
+                        dcBaseFinanceEbay.setOrderLineId(accountEntry.getOrderLineItemID());
+                        dcBaseFinanceEbay.setReceivedTopRatedDiscount(accountEntry.isReceivedTopRatedDiscount());
+                        dcBaseFinanceEbay.setDescription(accountEntry.getDescription());
+                        dcBaseFinanceEbay.setMemo(accountEntry.getMemo());
+                        dcBaseFinanceEbay.setRefNumber(accountEntry.getRefNumber());
+                        dcBaseFinanceEbay.setTitle(accountEntry.getTitle());
+                        dcBaseFinanceEbay.setReportDate(getAccountCall.getInvoiceDate().getTime());
+                        if (accountEntry.getGrossDetailAmount() != null) {
+                            dcBaseFinanceEbay.setGrossAmount(BigDecimal.valueOf(accountEntry.getGrossDetailAmount().getValue()));
+                            dcBaseFinanceEbay.setCurrency(accountEntry.getGrossDetailAmount().getCurrencyID().value());
+                            log.warn(dcBaseFinanceEbay.getBjDate().toString());
+                            dcBaseFinanceEbay.setExchangeRate(CallBailunSystem.getExchangeRate(dcBaseFinanceEbay.getCurrency(),  CurrencyType.CNY.value(), dcBaseFinanceEbay.getBjDate()));
+                            dcBaseFinanceEbay.setExchangeRateUsd(CallBailunSystem.getExchangeRate(dcBaseFinanceEbay.getCurrency(),  CurrencyType.USD.value(), dcBaseFinanceEbay.getBjDate()));
+                        }
+                        if (accountEntry.getGrossDetailAmount() != null) {
+                            dcBaseFinanceEbay.setNetAmount(BigDecimal.valueOf(accountEntry.getGrossDetailAmount().getValue()));
+                        }
+                        dcBaseFinanceEbay.setAccountId(dcBaseCompanyAccount.getAccountId());
+                        dcBaseFinanceEbay.setCompanyId(dcBaseCompanyAccount.getCompanyId());
+                        dcBaseFinanceEbay.setBjModified(LocalDateTime.now());
+                        DcBaseFinanceEbayMapper dcBaseFinanceEbayMapper = SessionUtil.getSession().getMapper(DcBaseFinanceEbayMapper.class);
+                /*int i = dcBaseFinanceEbayMapper.updateByExampleSelective(dcBaseFinanceEbay, DcBaseFinanceEbayExample.newAndCreateCriteria().andRefNumberEqualTo(dcBaseFinanceEbay.getRefNumber() == null ? "" : dcBaseFinanceEbay.getRefNumber()).andItemIdEqualTo(dcBaseFinanceEbay.getItemId() == null ? "" : dcBaseFinanceEbay.getItemId()).andAccountEntryTypeEqualTo(dcBaseFinanceEbay.getAccountEntryType() == null ? "" : dcBaseFinanceEbay.getAccountEntryType()).andGmtDateEqualTo(dcBaseFinanceEbay.getGmtDate()).example());
+                if (i == 0) {*/
+                        dcBaseFinanceEbayMapper.insertSelective(dcBaseFinanceEbay);
+                        /*}*/
+                    }pageIndex = pageIndex + 1;
+                }
+        }while (getAccountCall.getHasMoreEntries());
+            jobAccountLog.setPageIndex(1);
+            jobAccountLog.setStartTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()));
+            jobAccountLog.setEndTime(jobAccountLog.getEndTime().plusDays(jobAccountLog.getIntervalTime()));
+            jobAccountLog.setMessage("执行成功");
+        }catch (Exception e){
+            jobAccountLog.setPageIndex(1);
+            jobAccountLog.setStartTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()));
+            jobAccountLog.setEndTime(jobAccountLog.getEndTime().plusDays(jobAccountLog.getIntervalTime()));
+            jobAccountLog.setMessage("下载报告失败："+ e);
+        }
+
+    }
+
+
+    private static ApiContext getApiContext(String soapAuthToken) throws IOException {
+        ApiContext apiContext = new ApiContext();
+        ApiCredential cred = apiContext.getApiCredential();
+        cred.seteBayToken(soapAuthToken);
+        apiContext.setApiServerUrl("https://api.ebay.com/wsapi");
+        return apiContext;
+    }
+
+
+    private DcBaseCompanyAccount getToken(JobAccountLog jobAccountLog) {
+        DcBaseCompanyAccountMapper mapper = SessionUtil.getSession().getMapper(DcBaseCompanyAccountMapper.class);
+        return  mapper.selectOneByExample(DcBaseCompanyAccountExample.newAndCreateCriteria().andCompanyIdEqualTo(jobAccountLog.getCompanyId()).andAccountIdEqualTo(jobAccountLog.getAccountId()).example());
+    }
+
+
+}

data-base/base-sync-finance-ebay/src/main/resources/job.properties

@@ -8,6 +8,6 @@ EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
-JOB_NAME=base-sync-finance-ebay
-JOB_CRON=0 0/20 * * * ? *
+JOB_NAME=base-sync-finance-ebay-ad
+JOB_CRON=0 0 16 * * ? *
 SHARDING_TOTAL_COUNT=3
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceEbayMapper.xml

@@ -187,7 +187,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into dc_base_finance_ebay_temp
+    insert into dc_base_finance_ebay
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,

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

@@ -124,6 +124,8 @@ public interface JobAccountLogMapper {
 
     List<JobAccountLog> getListByPage(@Param("platformId") Integer platformId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize);
 
+    List<JobAccountLog> getListByPageEbay(@Param("platformId") Integer platformId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize);
+
     List<JobAccountLog> getListByPageAmazon(@Param("platformId") Integer platformId,@Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize);
 
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/JobAccountLogMapper.xml

@@ -614,6 +614,11 @@
     (SELECT * FROM dc_base_company_account WHERE 1=1  <if test="platformId != null">and platform_id=#{platformId} </if>) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id order by id  limit #{pageIndex},#{pageSize}
   </select>
 
+  <select id="getListByPageEbay" resultType="com.bailuntec.domain.entity.JobAccountLog">
+    SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM
+    (SELECT * FROM dc_base_company_account WHERE company_id = 1 and account_name not like '%test%'  <if test="platformId != null">and platform_id=#{platformId} </if>  order by id) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id  order by t1.id  limit #{pageIndex},#{pageSize}
+  </select>
+
   <select id="getListByPageAmazon" resultType="com.bailuntec.domain.entity.JobAccountLog">
     SELECT t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM
     (SELECT * FROM dc_base_company_account WHERE 1=1 and amazon_ad_auth_json != ''  <if test="platformId != null">and platform_id=#{platformId} </if>) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id order by id  limit #{pageIndex},#{pageSize}