Skip to content

D
dc-java
Commit f87ee4bd by wutong
Options

订单退款加入美元费用

parent 6c2fbee3
Showing with 115 additions and 15 deletions
data-base/base-sync-crm-refund/src/main/java/com/bailuntec/domain/pojo/RefundItem.java
......@@ -9,7 +9,6 @@ import java.util.Date;
@Data
public class RefundItem {
@JSONField(name = "ID")
private Integer crmId;
@JSONField(name = "PlatformName")
......@@ -30,6 +29,8 @@ public class RefundItem {
private BigDecimal amountRefund;
@JSONField(name = "Refund_CurrencyCode")
private String orderCurrency;
@JSONField(name = "USDRefundAmount")
private String amountRefundUsd;
@JSONField(name = "RefundTime")
private Date refundedTime;
@JSONField(name = "ProductPrice")
......
data-base/base-sync-crm-refund/src/main/java/com/bailuntec/mapper/DcBaseCrmRefundMapper.xml
......@@ -24,6 +24,7 @@
<result column="linked" jdbcType="BIT" property="linked" />
<result column="amount_refund_rmb" jdbcType="DECIMAL" property="amountRefundRmb" />
<result column="crm_id" jdbcType="INTEGER" property="crmId" />
<result column="amount_refund_usd" jdbcType="DECIMAL" property="amountRefundUsd" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -98,7 +99,8 @@
-->
id, platform_type, bailun_account, bailun_account_id, website, origin_order_id, bailun_sku,
platform_sku, amount_refund, order_currency, refund_time, bailun_sku_quantity_refund,
bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id
bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id,
amount_refund_usd
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
<!--
......@@ -164,15 +166,15 @@
bailun_sku, platform_sku, amount_refund,
order_currency, refund_time, bailun_sku_quantity_refund,
bailun_sku_unit_price, gmt_create, gmt_modified,
linked, amount_refund_rmb, crm_id
)
linked, amount_refund_rmb, crm_id,
amount_refund_usd)
values (#{id,jdbcType=INTEGER}, #{platformType,jdbcType=VARCHAR}, #{bailunAccount,jdbcType=VARCHAR},
#{bailunAccountId,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR},
#{bailunSku,jdbcType=VARCHAR}, #{platformSku,jdbcType=VARCHAR}, #{amountRefund,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{bailunSkuQuantityRefund,jdbcType=INTEGER},
#{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER}
)
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER},
#{amountRefundUsd,jdbcType=DECIMAL})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
<!--
......@@ -235,6 +237,9 @@
<if test="crmId != null">
crm_id,
</if>
<if test="amountRefundUsd != null">
amount_refund_usd,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -291,6 +296,9 @@
<if test="crmId != null">
#{crmId,jdbcType=INTEGER},
</if>
<if test="amountRefundUsd != null">
#{amountRefundUsd,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultType="java.lang.Long">
......@@ -364,6 +372,9 @@
<if test="record.crmId != null">
crm_id = #{record.crmId,jdbcType=INTEGER},
</if>
<if test="record.amountRefundUsd != null">
amount_refund_usd = #{record.amountRefundUsd,jdbcType=DECIMAL},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -392,7 +403,8 @@
gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
linked = #{record.linked,jdbcType=BIT},
amount_refund_rmb = #{record.amountRefundRmb,jdbcType=DECIMAL},
crm_id = #{record.crmId,jdbcType=INTEGER}
crm_id = #{record.crmId,jdbcType=INTEGER},
amount_refund_usd = #{record.amountRefundUsd,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -455,6 +467,9 @@
<if test="crmId != null">
crm_id = #{crmId,jdbcType=INTEGER},
</if>
<if test="amountRefundUsd != null">
amount_refund_usd = #{amountRefundUsd,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -480,7 +495,8 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
linked = #{linked,jdbcType=BIT},
amount_refund_rmb = #{amountRefundRmb,jdbcType=DECIMAL},
crm_id = #{crmId,jdbcType=INTEGER}
crm_id = #{crmId,jdbcType=INTEGER},
amount_refund_usd = #{amountRefundUsd,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
......@@ -545,6 +561,9 @@
<if test="crmId != null">
crm_id,
</if>
<if test="amountRefundUsd != null">
amount_refund_usd,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -602,6 +621,9 @@
<if test="crmId != null">
#{crmId,jdbcType=INTEGER},
</if>
<if test="amountRefundUsd != null">
#{amountRefundUsd,jdbcType=DECIMAL},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -659,6 +681,9 @@
<if test="crmId != null">
crm_id = #{crmId,jdbcType=INTEGER},
</if>
<if test="amountRefundUsd != null">
amount_refund_usd = #{amountRefundUsd,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
......@@ -670,16 +695,16 @@
insert into dc_base_crm_refund
(id, platform_type, bailun_account, bailun_account_id, website, origin_order_id,
bailun_sku, platform_sku, amount_refund, order_currency, refund_time, bailun_sku_quantity_refund,
bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id
)
bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id,
amount_refund_usd)
values
(#{id,jdbcType=INTEGER}, #{platformType,jdbcType=VARCHAR}, #{bailunAccount,jdbcType=VARCHAR},
#{bailunAccountId,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR},
#{bailunSku,jdbcType=VARCHAR}, #{platformSku,jdbcType=VARCHAR}, #{amountRefund,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{bailunSkuQuantityRefund,jdbcType=INTEGER},
#{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER}
)
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER},
#{amountRefundUsd,jdbcType=DECIMAL})
on duplicate key update
id = #{id,jdbcType=INTEGER},
platform_type = #{platformType,jdbcType=VARCHAR},
......@@ -698,7 +723,8 @@
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
linked = #{linked,jdbcType=BIT},
amount_refund_rmb = #{amountRefundRmb,jdbcType=DECIMAL},
crm_id = #{crmId,jdbcType=INTEGER}
crm_id = #{crmId,jdbcType=INTEGER},
amount_refund_usd = #{amountRefundUsd,jdbcType=DECIMAL}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCrmRefund.java
......@@ -170,6 +170,15 @@ public class DcBaseCrmRefund {
private Integer crmId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_crm_refund.amount_refund_usd
*
* @mbg.generated
*/
private BigDecimal amountRefundUsd;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_crm_refund
*
......@@ -199,6 +208,7 @@ public class DcBaseCrmRefund {
sb.append(", linked=").append(linked);
sb.append(", amountRefundRmb=").append(amountRefundRmb);
sb.append(", crmId=").append(crmId);
sb.append(", amountRefundUsd=").append(amountRefundUsd);
sb.append("]");
return sb.toString();
}
......@@ -238,7 +248,8 @@ public class DcBaseCrmRefund {
&& (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
&& (this.getLinked() == null ? other.getLinked() == null : this.getLinked().equals(other.getLinked()))
&& (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb()))
&& (this.getCrmId() == null ? other.getCrmId() == null : this.getCrmId().equals(other.getCrmId()));
&& (this.getCrmId() == null ? other.getCrmId() == null : this.getCrmId().equals(other.getCrmId()))
&& (this.getAmountRefundUsd() == null ? other.getAmountRefundUsd() == null : this.getAmountRefundUsd().equals(other.getAmountRefundUsd()));
}
/**
......@@ -269,6 +280,7 @@ public class DcBaseCrmRefund {
result = prime * result + ((getLinked() == null) ? 0 : getLinked().hashCode());
result = prime * result + ((getAmountRefundRmb() == null) ? 0 : getAmountRefundRmb().hashCode());
result = prime * result + ((getCrmId() == null) ? 0 : getCrmId().hashCode());
result = prime * result + ((getAmountRefundUsd() == null) ? 0 : getAmountRefundUsd().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCrmRefundExample.java
......@@ -1520,6 +1520,66 @@ public class DcBaseCrmRefundExample {
addCriterion("crm_id not between", value1, value2, "crmId");
return (Criteria) this;
}
public Criteria andAmountRefundUsdIsNull() {
addCriterion("amount_refund_usd is null");
return (Criteria) this;
}
public Criteria andAmountRefundUsdIsNotNull() {
addCriterion("amount_refund_usd is not null");
return (Criteria) this;
}
public Criteria andAmountRefundUsdEqualTo(BigDecimal value) {
addCriterion("amount_refund_usd =", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdNotEqualTo(BigDecimal value) {
addCriterion("amount_refund_usd <>", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdGreaterThan(BigDecimal value) {
addCriterion("amount_refund_usd >", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("amount_refund_usd >=", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdLessThan(BigDecimal value) {
addCriterion("amount_refund_usd <", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdLessThanOrEqualTo(BigDecimal value) {
addCriterion("amount_refund_usd <=", value, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdIn(List<BigDecimal> values) {
addCriterion("amount_refund_usd in", values, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdNotIn(List<BigDecimal> values) {
addCriterion("amount_refund_usd not in", values, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_refund_usd between", value1, value2, "amountRefundUsd");
return (Criteria) this;
}
public Criteria andAmountRefundUsdNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_refund_usd not between", value1, value2, "amountRefundUsd");
return (Criteria) this;
}
}
/**
......
mybatis-generator/src/main/resources/init.properties
table-name=dc_auto_turnover
table-name=dc_base_crm_refund
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