Skip to content

D
dc-java
Commit fa7f5cc6 by wutong
Options

账号信息同步新增Amazon广告授权信息

parent 3f21cf8e
Showing with 138 additions and 13 deletions
data-base/base-sync-company/src/main/java/com/bailuntec/domain/pojo/CompanyAccountInfo.java
......@@ -237,5 +237,15 @@ public class CompanyAccountInfo {
@JSONField(name = "EbayAdAuthJson")
private String ebayAdAuthJson;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_company_account.ebay_ad_auth_json
*
* @mbg.generated
*/
@JSONField(name = "AmazonAdAuthJson")
private String amazonAdAuthJson;
}
\ No newline at end of file
data-base/base-sync-company/src/main/java/com/bailuntec/mapper/DcBaseCompanyAccountMapper.java
......@@ -2,9 +2,10 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcBaseCompanyAccount;
import com.bailuntec.domain.example.DcBaseCompanyAccountExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DcBaseCompanyAccountMapper {
/**
* This method was generated by MyBatis Generator.
......
data-base/base-sync-company/src/main/java/com/bailuntec/mapper/DcBaseCompanyAccountMapper.xml
......@@ -32,6 +32,7 @@
<result column="ebay_ad_auth_json" jdbcType="VARCHAR" property="ebayAdAuthJson" />
<result column="bj_create" jdbcType="TIMESTAMP" property="bjCreate" />
<result column="bj_modified" jdbcType="TIMESTAMP" property="bjModified" />
<result column="amazon_ad_auth_json" jdbcType="VARCHAR" property="amazonAdAuthJson" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -107,7 +108,7 @@
id, company_id, account_id, account_name, account_email, oms_code, oms_account, platform_id,
platform_cn, platform_en, site_id, site_cn, site_en, auth_json, status, status_cn,
soap_auth_token, soap_auth_status, auth_status, extension_info, developer_json, manager,
seller_id, ebay_ad_auth_json, bj_create, bj_modified
seller_id, ebay_ad_auth_json, bj_create, bj_modified, amazon_ad_auth_json
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCompanyAccountExample" resultMap="BaseResultMap">
<!--
......@@ -176,7 +177,8 @@
status_cn, soap_auth_token, soap_auth_status,
auth_status, extension_info, developer_json,
manager, seller_id, ebay_ad_auth_json,
bj_create, bj_modified)
bj_create, bj_modified, amazon_ad_auth_json
)
values (#{id,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{accountId,jdbcType=INTEGER},
#{accountName,jdbcType=VARCHAR}, #{accountEmail,jdbcType=VARCHAR}, #{omsCode,jdbcType=VARCHAR},
#{omsAccount,jdbcType=VARCHAR}, #{platformId,jdbcType=INTEGER}, #{platformCn,jdbcType=VARCHAR},
......@@ -185,7 +187,8 @@
#{statusCn,jdbcType=VARCHAR}, #{soapAuthToken,jdbcType=VARCHAR}, #{soapAuthStatus,jdbcType=TINYINT},
#{authStatus,jdbcType=TINYINT}, #{extensionInfo,jdbcType=VARCHAR}, #{developerJson,jdbcType=VARCHAR},
#{manager,jdbcType=VARCHAR}, #{sellerId,jdbcType=VARCHAR}, #{ebayAdAuthJson,jdbcType=VARCHAR},
#{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP})
#{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP}, #{amazonAdAuthJson,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCompanyAccount">
<!--
......@@ -272,6 +275,9 @@
<if test="bjModified != null">
bj_modified,
</if>
<if test="amazonAdAuthJson != null">
amazon_ad_auth_json,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -352,6 +358,9 @@
<if test="bjModified != null">
#{bjModified,jdbcType=TIMESTAMP},
</if>
<if test="amazonAdAuthJson != null">
#{amazonAdAuthJson,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCompanyAccountExample" resultType="java.lang.Long">
......@@ -449,6 +458,9 @@
<if test="record.bjModified != null">
bj_modified = #{record.bjModified,jdbcType=TIMESTAMP},
</if>
<if test="record.amazonAdAuthJson != null">
amazon_ad_auth_json = #{record.amazonAdAuthJson,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -485,7 +497,8 @@
seller_id = #{record.sellerId,jdbcType=VARCHAR},
ebay_ad_auth_json = #{record.ebayAdAuthJson,jdbcType=VARCHAR},
bj_create = #{record.bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{record.bjModified,jdbcType=TIMESTAMP}
bj_modified = #{record.bjModified,jdbcType=TIMESTAMP},
amazon_ad_auth_json = #{record.amazonAdAuthJson,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -572,6 +585,9 @@
<if test="bjModified != null">
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
</if>
<if test="amazonAdAuthJson != null">
amazon_ad_auth_json = #{amazonAdAuthJson,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -605,7 +621,8 @@
seller_id = #{sellerId,jdbcType=VARCHAR},
ebay_ad_auth_json = #{ebayAdAuthJson,jdbcType=VARCHAR},
bj_create = #{bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{bjModified,jdbcType=TIMESTAMP}
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
amazon_ad_auth_json = #{amazonAdAuthJson,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCompanyAccount">
......@@ -694,6 +711,9 @@
<if test="bjModified != null">
bj_modified,
</if>
<if test="amazonAdAuthJson != null">
amazon_ad_auth_json,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -775,6 +795,9 @@
<if test="bjModified != null">
#{bjModified,jdbcType=TIMESTAMP},
</if>
<if test="amazonAdAuthJson != null">
#{amazonAdAuthJson,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -856,6 +879,9 @@
<if test="bjModified != null">
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
</if>
<if test="amazonAdAuthJson != null">
amazon_ad_auth_json = #{amazonAdAuthJson,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCompanyAccount">
......@@ -868,7 +894,8 @@
(id, company_id, account_id, account_name, account_email, oms_code, oms_account,
platform_id, platform_cn, platform_en, site_id, site_cn, site_en, auth_json, status,
status_cn, soap_auth_token, soap_auth_status, auth_status, extension_info, developer_json,
manager, seller_id, ebay_ad_auth_json, bj_create, bj_modified)
manager, seller_id, ebay_ad_auth_json, bj_create, bj_modified, amazon_ad_auth_json
)
values
(#{id,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{accountId,jdbcType=INTEGER},
#{accountName,jdbcType=VARCHAR}, #{accountEmail,jdbcType=VARCHAR}, #{omsCode,jdbcType=VARCHAR},
......@@ -878,7 +905,8 @@
#{statusCn,jdbcType=VARCHAR}, #{soapAuthToken,jdbcType=VARCHAR}, #{soapAuthStatus,jdbcType=TINYINT},
#{authStatus,jdbcType=TINYINT}, #{extensionInfo,jdbcType=VARCHAR}, #{developerJson,jdbcType=VARCHAR},
#{manager,jdbcType=VARCHAR}, #{sellerId,jdbcType=VARCHAR}, #{ebayAdAuthJson,jdbcType=VARCHAR},
#{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP})
#{bjCreate,jdbcType=TIMESTAMP}, #{bjModified,jdbcType=TIMESTAMP}, #{amazonAdAuthJson,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
company_id = #{companyId,jdbcType=INTEGER},
......@@ -905,7 +933,8 @@
seller_id = #{sellerId,jdbcType=VARCHAR},
ebay_ad_auth_json = #{ebayAdAuthJson,jdbcType=VARCHAR},
bj_create = #{bjCreate,jdbcType=TIMESTAMP},
bj_modified = #{bjModified,jdbcType=TIMESTAMP}
bj_modified = #{bjModified,jdbcType=TIMESTAMP},
amazon_ad_auth_json = #{amazonAdAuthJson,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCompanyAccountExample" resultMap="BaseResultMap">
<!--
......
data-base/base-sync-company/src/main/resources/job.properties
......@@ -11,7 +11,7 @@ NAME_SPACE=data-center
JOB_NAME_COMPANY_INFO=base-sync-company-info
JOB_NAME_COMPANY_STAFF=base-sync-company-staff
JOB_NAME_COMPANY_ACCOUNT=base-sync-company-account
JOB_CRON_COMPANY_INFO=0 0 2/4 * * ? *
JOB_CRON_COMPANY_STAFF=5 5 1/4 * * ? *
JOB_CRON_COMPANY_ACCOUNT=0 0 1/2 * * ? *
JOB_CRON_COMPANY_INFO=0 0 2/2 * * ? *
JOB_CRON_COMPANY_STAFF=5 5 1/2 * * ? *
JOB_CRON_COMPANY_ACCOUNT=0 0/10 * * * ? *
SHARDING_TOTAL_COUNT=1
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCompanyAccount.java
......@@ -241,6 +241,15 @@ public class DcBaseCompanyAccount {
private LocalDateTime bjModified;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_company_account.amazon_ad_auth_json
*
* @mbg.generated
*/
private String amazonAdAuthJson;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_company_account
*
......@@ -278,6 +287,7 @@ public class DcBaseCompanyAccount {
sb.append(", ebayAdAuthJson=").append(ebayAdAuthJson);
sb.append(", bjCreate=").append(bjCreate);
sb.append(", bjModified=").append(bjModified);
sb.append(", amazonAdAuthJson=").append(amazonAdAuthJson);
sb.append("]");
return sb.toString();
}
......@@ -325,7 +335,8 @@ public class DcBaseCompanyAccount {
&& (this.getSellerId() == null ? other.getSellerId() == null : this.getSellerId().equals(other.getSellerId()))
&& (this.getEbayAdAuthJson() == null ? other.getEbayAdAuthJson() == null : this.getEbayAdAuthJson().equals(other.getEbayAdAuthJson()))
&& (this.getBjCreate() == null ? other.getBjCreate() == null : this.getBjCreate().equals(other.getBjCreate()))
&& (this.getBjModified() == null ? other.getBjModified() == null : this.getBjModified().equals(other.getBjModified()));
&& (this.getBjModified() == null ? other.getBjModified() == null : this.getBjModified().equals(other.getBjModified()))
&& (this.getAmazonAdAuthJson() == null ? other.getAmazonAdAuthJson() == null : this.getAmazonAdAuthJson().equals(other.getAmazonAdAuthJson()));
}
/**
......@@ -364,6 +375,7 @@ public class DcBaseCompanyAccount {
result = prime * result + ((getEbayAdAuthJson() == null) ? 0 : getEbayAdAuthJson().hashCode());
result = prime * result + ((getBjCreate() == null) ? 0 : getBjCreate().hashCode());
result = prime * result + ((getBjModified() == null) ? 0 : getBjModified().hashCode());
result = prime * result + ((getAmazonAdAuthJson() == null) ? 0 : getAmazonAdAuthJson().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCompanyAccountExample.java
......@@ -2089,6 +2089,76 @@ public class DcBaseCompanyAccountExample {
addCriterion("bj_modified not between", value1, value2, "bjModified");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonIsNull() {
addCriterion("amazon_ad_auth_json is null");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonIsNotNull() {
addCriterion("amazon_ad_auth_json is not null");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonEqualTo(String value) {
addCriterion("amazon_ad_auth_json =", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonNotEqualTo(String value) {
addCriterion("amazon_ad_auth_json <>", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonGreaterThan(String value) {
addCriterion("amazon_ad_auth_json >", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonGreaterThanOrEqualTo(String value) {
addCriterion("amazon_ad_auth_json >=", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonLessThan(String value) {
addCriterion("amazon_ad_auth_json <", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonLessThanOrEqualTo(String value) {
addCriterion("amazon_ad_auth_json <=", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonLike(String value) {
addCriterion("amazon_ad_auth_json like", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonNotLike(String value) {
addCriterion("amazon_ad_auth_json not like", value, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonIn(List<String> values) {
addCriterion("amazon_ad_auth_json in", values, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonNotIn(List<String> values) {
addCriterion("amazon_ad_auth_json not in", values, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonBetween(String value1, String value2) {
addCriterion("amazon_ad_auth_json between", value1, value2, "amazonAdAuthJson");
return (Criteria) this;
}
public Criteria andAmazonAdAuthJsonNotBetween(String value1, String value2) {
addCriterion("amazon_ad_auth_json not between", value1, value2, "amazonAdAuthJson");
return (Criteria) this;
}
}
/**
......
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