Commit 434a4192 by yinyong

ebay费用修改

parent a3f86b50
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>io.github.linus87</groupId>
<artifactId>ebaycalls</artifactId>
<version>1065</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
package com.bailuntec; package com.bailuntec;
import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource;
import com.bailuntec.job.EbayFinanceSyncJob;
import com.bailuntec.job.EbayFinanceAdSyncJob;
import com.bailuntec.utils.PropertiesUtil; import com.bailuntec.utils.PropertiesUtil;
import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.JobCoreConfiguration;
import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration; import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration;
...@@ -35,7 +36,7 @@ public class Application { ...@@ -35,7 +36,7 @@ public class Application {
private static LiteJobConfiguration createJobConfiguration1() { private static LiteJobConfiguration createJobConfiguration1() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME"), propertiesUtil.getPropertyAsString("JOB_CRON"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); 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(); LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig; return simpleJobRootConfig;
} }
......
...@@ -8,6 +8,6 @@ EVENT_RDB_STORAGE_USERNAME=root ...@@ -8,6 +8,6 @@ EVENT_RDB_STORAGE_USERNAME=root
EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf 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 NAME_SPACE=data-center
JOB_NAME=base-sync-finance-ebay JOB_NAME=base-sync-finance-ebay-ad
JOB_CRON=0 0/20 * * * ? * JOB_CRON=0 0 16 * * ? *
SHARDING_TOTAL_COUNT=3 SHARDING_TOTAL_COUNT=3
\ No newline at end of file
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. 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=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
......
...@@ -124,6 +124,8 @@ public interface JobAccountLogMapper { ...@@ -124,6 +124,8 @@ public interface JobAccountLogMapper {
List<JobAccountLog> getListByPage(@Param("platformId") Integer platformId, @Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize); 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); List<JobAccountLog> getListByPageAmazon(@Param("platformId") Integer platformId,@Param("pageIndex") Integer pageIndex, @Param("pageSize") Integer pageSize);
} }
\ No newline at end of file
...@@ -614,6 +614,11 @@ ...@@ -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 * 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>
<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 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 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} (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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment