Skip to content

D
dc-java
Commit 539058ce by yinyong
Options

同步crm新增订单状态

parent f46722a1
Showing with 351 additions and 41 deletions
data-base/base-sync-crm-refund/src/main/java/com/bailuntec/domain/pojo/RefundItem.java
......@@ -53,4 +53,6 @@ public class RefundItem {
private Integer isFreeze;
@JSONField(name = "RmbRefundAmount")
private BigDecimal amountRefundRmb;
@JSONField(name = "order_status")
private String orderStatus;
}
data-base/base-sync-finance-wish/src/main/java/com/bailuntec/job/WishSyncJob.java
......@@ -56,7 +56,6 @@ public class WishSyncJob extends PointJob {
localDateTime = localDateTime.plusDays(1L);
}while (!localDateTime.isAfter(jobAccountLog.getEndTime()));
jobAccountLog.setStartTime(jobAccountLog.getEndTime());
jobAccountLog.setMessage("执行成功");
jobAccountLog.setEndTime(jobAccountLog.getStartTime().plusDays(jobAccountLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobAccountLog.getEndTime().plusDays(jobAccountLog.getIntervalTime()));
jobAccountLogMapper = SessionUtil.getSession().getMapper(JobAccountLogMapper.class);
if (jobAccountLog.getId() == null) {
......@@ -77,7 +76,7 @@ public class WishSyncJob extends PointJob {
LinkedHashMap<String, String> map = new LinkedHashMap<>(3);
DcBaseCompanyAccount dcBaseCompanyAccount = getToken(jobAccountLog);
WishAuth wishAuth = JSON.parseObject(dcBaseCompanyAccount.getAuthJson(), WishAuth.class);
map.put("start_time", DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(jobAccountLog.getStartTime()));
// map.put("start_time", DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(jobAccountLog.getStartTime()));
map.put("access_token", wishAuth.getAccessToken());
map.put("limit", String.valueOf(jobAccountLog.getPageSize()));
String urlPath = OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("MULTI_CAMPAIGN_GET_URL"), map);
......@@ -123,10 +122,8 @@ public class WishSyncJob extends PointJob {
for(Map<String, DcBaseFinanceWish> maps : mapList) {
DcBaseFinanceWish dcBaseFinanceWish = null;
boolean updateInsert = true;
boolean afterTime = false;
try {
dcBaseFinanceWish = maps.get("Campaign");
if(jobAccountLog.getStartTime().compareTo(dcBaseFinanceWish.getStartTime()) > -1) {
BigDecimal exchangeRate = CallBailunSystem.getExchangeRate(CurrencyType.USD.value(), CurrencyType.CNY.value(), dcBaseFinanceWish.getStartTime());
dcBaseFinanceWish.setOtherToCnyExchangeRate(exchangeRate);
dcBaseFinanceWish.setAccountId(jobAccountLog.getAccountId());
......@@ -144,8 +141,6 @@ public class WishSyncJob extends PointJob {
}
updateInsert = false;
}
afterTime = true;
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Mybatis操作DB插入任务记录失败", e);
......@@ -153,21 +148,20 @@ public class WishSyncJob extends PointJob {
SessionUtil.closeSession();
}
try {
if(afterTime) {
List<Map<String, DcBaseFinanceWishProduct>> listWishProduct = maps.get("Campaign").getListWishProduct();
if(updateInsert) {
DcBaseFinanceWishProductMapper dcBaseFinanceWishProductMapper = SessionUtil.getSession().getMapper(DcBaseFinanceWishProductMapper.class);
dcBaseFinanceWishProductMapper.deleteByExample(DcBaseFinanceWishProductExample.newAndCreateCriteria().andCampaignIdEqualTo(dcBaseFinanceWish.getCampaignId()).example());
dcBaseFinanceWishProductMapper.deleteByExample(DcBaseFinanceWishProductExample.newAndCreateCriteria().andCampaignIdEqualTo(dcBaseFinanceWish.getCampaignId()).andRecordTimeEqualTo(dcBaseFinanceWish.getRecordTime()).example());
}
if(listWishProduct != null) {
for(Map<String, DcBaseFinanceWishProduct> dcBaseFinanceWishProductMap : listWishProduct) {
DcBaseFinanceWishProduct dcBaseFinanceWishProduct = dcBaseFinanceWishProductMap.get("Product");
dcBaseFinanceWishProduct.setCampaignId(dcBaseFinanceWish.getCampaignId());
dcBaseFinanceWishProduct.setRecordTime(dcBaseFinanceWish.getRecordTime());
DcBaseFinanceWishProductMapper dcBaseFinanceWishProductMapper = SessionUtil.getSession().getMapper(DcBaseFinanceWishProductMapper.class);
dcBaseFinanceWishProductMapper.insertSelective(dcBaseFinanceWishProduct);
}
}
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Mybatis操作DB插入任务记录失败", e);
......@@ -176,7 +170,6 @@ public class WishSyncJob extends PointJob {
}
try {
if(afterTime) {
if(updateInsert) {
DcBaseFinanceWishImpressionFeeMapper dcBaseFinanceWishImpressionFeeMapper = SessionUtil.getSession().getMapper(DcBaseFinanceWishImpressionFeeMapper.class);
dcBaseFinanceWishImpressionFeeMapper.deleteByExample(DcBaseFinanceWishImpressionFeeExample.newAndCreateCriteria().andCampaignIdEqualTo(dcBaseFinanceWish.getCampaignId()).example());
......@@ -186,11 +179,11 @@ public class WishSyncJob extends PointJob {
for(Map<String, DcBaseFinanceWishImpressionFee> dcBaseFinanceWishImpressionFeeMap : listWishImpressionFee) {
DcBaseFinanceWishImpressionFee dcBaseFinanceWishImpressionFee = dcBaseFinanceWishImpressionFeeMap.get("ImpressionFee");
dcBaseFinanceWishImpressionFee.setCampaignId(dcBaseFinanceWish.getCampaignId());
dcBaseFinanceWishImpressionFee.setRecordTime(dcBaseFinanceWish.getRecordTime());
DcBaseFinanceWishImpressionFeeMapper dcBaseFinanceWishImpressionFeeMapper = SessionUtil.getSession().getMapper(DcBaseFinanceWishImpressionFeeMapper.class);
dcBaseFinanceWishImpressionFeeMapper.insertSelective(dcBaseFinanceWishImpressionFee);
}
}
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Mybatis操作DB插入任务记录失败", e);
......@@ -206,6 +199,7 @@ public class WishSyncJob extends PointJob {
}
}
}
jobAccountLog.setMessage("执行成功");
}else {
jobAccountLog.setMessage(palResultStr);
}
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCrmRefund.java
......@@ -233,6 +233,15 @@ public class DcBaseCrmRefund {
private Boolean isFreeze;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_crm_refund.order_status
*
* @mbg.generated
*/
private String orderStatus;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_crm_refund
*
......@@ -269,6 +278,7 @@ public class DcBaseCrmRefund {
sb.append(", productSaleAmount=").append(productSaleAmount);
sb.append(", isDeleted=").append(isDeleted);
sb.append(", isFreeze=").append(isFreeze);
sb.append(", orderStatus=").append(orderStatus);
sb.append("]");
return sb.toString();
}
......@@ -315,7 +325,8 @@ public class DcBaseCrmRefund {
&& (this.getUsdOrderTotalAmount() == null ? other.getUsdOrderTotalAmount() == null : this.getUsdOrderTotalAmount().equals(other.getUsdOrderTotalAmount()))
&& (this.getProductSaleAmount() == null ? other.getProductSaleAmount() == null : this.getProductSaleAmount().equals(other.getProductSaleAmount()))
&& (this.getIsDeleted() == null ? other.getIsDeleted() == null : this.getIsDeleted().equals(other.getIsDeleted()))
&& (this.getIsFreeze() == null ? other.getIsFreeze() == null : this.getIsFreeze().equals(other.getIsFreeze()));
&& (this.getIsFreeze() == null ? other.getIsFreeze() == null : this.getIsFreeze().equals(other.getIsFreeze()))
&& (this.getOrderStatus() == null ? other.getOrderStatus() == null : this.getOrderStatus().equals(other.getOrderStatus()));
}
/**
......@@ -353,6 +364,7 @@ public class DcBaseCrmRefund {
result = prime * result + ((getProductSaleAmount() == null) ? 0 : getProductSaleAmount().hashCode());
result = prime * result + ((getIsDeleted() == null) ? 0 : getIsDeleted().hashCode());
result = prime * result + ((getIsFreeze() == null) ? 0 : getIsFreeze().hashCode());
result = prime * result + ((getOrderStatus() == null) ? 0 : getOrderStatus().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinanceWishImpressionFee.java
......@@ -3,6 +3,7 @@ package com.bailuntec.domain.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
......@@ -62,6 +63,15 @@ public class DcBaseFinanceWishImpressionFee {
private LocalDateTime endTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_wish_impression_fee.record_time
*
* @mbg.generated
*/
private LocalDate recordTime;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_finance_wish_impression_fee
*
......@@ -79,6 +89,7 @@ public class DcBaseFinanceWishImpressionFee {
sb.append(", startTime=").append(startTime);
sb.append(", feeState=").append(feeState);
sb.append(", endTime=").append(endTime);
sb.append(", recordTime=").append(recordTime);
sb.append("]");
return sb.toString();
}
......@@ -106,7 +117,8 @@ public class DcBaseFinanceWishImpressionFee {
&& (this.getAmount() == null ? other.getAmount() == null : this.getAmount().equals(other.getAmount()))
&& (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
&& (this.getFeeState() == null ? other.getFeeState() == null : this.getFeeState().equals(other.getFeeState()))
&& (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()));
&& (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
&& (this.getRecordTime() == null ? other.getRecordTime() == null : this.getRecordTime().equals(other.getRecordTime()));
}
/**
......@@ -125,6 +137,7 @@ public class DcBaseFinanceWishImpressionFee {
result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
result = prime * result + ((getFeeState() == null) ? 0 : getFeeState().hashCode());
result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
result = prime * result + ((getRecordTime() == null) ? 0 : getRecordTime().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinanceWishProduct.java
......@@ -3,6 +3,7 @@ package com.bailuntec.domain.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
public class DcBaseFinanceWishProduct {
......@@ -52,6 +53,15 @@ public class DcBaseFinanceWishProduct {
private BigDecimal enrollmentFee;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_finance_wish_product.record_time
*
* @mbg.generated
*/
private LocalDate recordTime;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_finance_wish_product
*
......@@ -68,6 +78,7 @@ public class DcBaseFinanceWishProduct {
sb.append(", keywords=").append(keywords);
sb.append(", productId=").append(productId);
sb.append(", enrollmentFee=").append(enrollmentFee);
sb.append(", recordTime=").append(recordTime);
sb.append("]");
return sb.toString();
}
......@@ -94,7 +105,8 @@ public class DcBaseFinanceWishProduct {
&& (this.getCampaignId() == null ? other.getCampaignId() == null : this.getCampaignId().equals(other.getCampaignId()))
&& (this.getKeywords() == null ? other.getKeywords() == null : this.getKeywords().equals(other.getKeywords()))
&& (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
&& (this.getEnrollmentFee() == null ? other.getEnrollmentFee() == null : this.getEnrollmentFee().equals(other.getEnrollmentFee()));
&& (this.getEnrollmentFee() == null ? other.getEnrollmentFee() == null : this.getEnrollmentFee().equals(other.getEnrollmentFee()))
&& (this.getRecordTime() == null ? other.getRecordTime() == null : this.getRecordTime().equals(other.getRecordTime()));
}
/**
......@@ -112,6 +124,7 @@ public class DcBaseFinanceWishProduct {
result = prime * result + ((getKeywords() == null) ? 0 : getKeywords().hashCode());
result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
result = prime * result + ((getEnrollmentFee() == null) ? 0 : getEnrollmentFee().hashCode());
result = prime * result + ((getRecordTime() == null) ? 0 : getRecordTime().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCrmRefundExample.java
......@@ -1940,6 +1940,76 @@ public class DcBaseCrmRefundExample {
addCriterion("is_freeze not between", value1, value2, "isFreeze");
return (Criteria) this;
}
public Criteria andOrderStatusIsNull() {
addCriterion("order_status is null");
return (Criteria) this;
}
public Criteria andOrderStatusIsNotNull() {
addCriterion("order_status is not null");
return (Criteria) this;
}
public Criteria andOrderStatusEqualTo(String value) {
addCriterion("order_status =", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusNotEqualTo(String value) {
addCriterion("order_status <>", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusGreaterThan(String value) {
addCriterion("order_status >", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusGreaterThanOrEqualTo(String value) {
addCriterion("order_status >=", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusLessThan(String value) {
addCriterion("order_status <", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusLessThanOrEqualTo(String value) {
addCriterion("order_status <=", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusLike(String value) {
addCriterion("order_status like", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusNotLike(String value) {
addCriterion("order_status not like", value, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusIn(List<String> values) {
addCriterion("order_status in", values, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusNotIn(List<String> values) {
addCriterion("order_status not in", values, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusBetween(String value1, String value2) {
addCriterion("order_status between", value1, value2, "orderStatus");
return (Criteria) this;
}
public Criteria andOrderStatusNotBetween(String value1, String value2) {
addCriterion("order_status not between", value1, value2, "orderStatus");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinanceWishImpressionFeeExample.java
package com.bailuntec.domain.example;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
......@@ -750,6 +751,66 @@ public class DcBaseFinanceWishImpressionFeeExample {
addCriterion("end_time not between", value1, value2, "endTime");
return (Criteria) this;
}
public Criteria andRecordTimeIsNull() {
addCriterion("record_time is null");
return (Criteria) this;
}
public Criteria andRecordTimeIsNotNull() {
addCriterion("record_time is not null");
return (Criteria) this;
}
public Criteria andRecordTimeEqualTo(LocalDate value) {
addCriterion("record_time =", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotEqualTo(LocalDate value) {
addCriterion("record_time <>", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeGreaterThan(LocalDate value) {
addCriterion("record_time >", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeGreaterThanOrEqualTo(LocalDate value) {
addCriterion("record_time >=", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeLessThan(LocalDate value) {
addCriterion("record_time <", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeLessThanOrEqualTo(LocalDate value) {
addCriterion("record_time <=", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeIn(List<LocalDate> values) {
addCriterion("record_time in", values, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotIn(List<LocalDate> values) {
addCriterion("record_time not in", values, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeBetween(LocalDate value1, LocalDate value2) {
addCriterion("record_time between", value1, value2, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotBetween(LocalDate value1, LocalDate value2) {
addCriterion("record_time not between", value1, value2, "recordTime");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinanceWishProductExample.java
package com.bailuntec.domain.example;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
......@@ -699,6 +700,66 @@ public class DcBaseFinanceWishProductExample {
addCriterion("enrollment_fee not between", value1, value2, "enrollmentFee");
return (Criteria) this;
}
public Criteria andRecordTimeIsNull() {
addCriterion("record_time is null");
return (Criteria) this;
}
public Criteria andRecordTimeIsNotNull() {
addCriterion("record_time is not null");
return (Criteria) this;
}
public Criteria andRecordTimeEqualTo(LocalDate value) {
addCriterion("record_time =", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotEqualTo(LocalDate value) {
addCriterion("record_time <>", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeGreaterThan(LocalDate value) {
addCriterion("record_time >", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeGreaterThanOrEqualTo(LocalDate value) {
addCriterion("record_time >=", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeLessThan(LocalDate value) {
addCriterion("record_time <", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeLessThanOrEqualTo(LocalDate value) {
addCriterion("record_time <=", value, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeIn(List<LocalDate> values) {
addCriterion("record_time in", values, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotIn(List<LocalDate> values) {
addCriterion("record_time not in", values, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeBetween(LocalDate value1, LocalDate value2) {
addCriterion("record_time between", value1, value2, "recordTime");
return (Criteria) this;
}
public Criteria andRecordTimeNotBetween(LocalDate value1, LocalDate value2) {
addCriterion("record_time not between", value1, value2, "recordTime");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseCrmRefundMapper.xml
......@@ -31,6 +31,7 @@
<result column="product_sale_amount" jdbcType="DECIMAL" property="productSaleAmount" />
<result column="is_deleted" jdbcType="BIT" property="isDeleted" />
<result column="is_freeze" jdbcType="BIT" property="isFreeze" />
<result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -107,7 +108,7 @@
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,
amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount,
is_deleted, is_freeze
is_deleted, is_freeze, order_status
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
<!--
......@@ -176,7 +177,8 @@
linked, amount_refund_rmb, crm_id,
amount_refund_usd, company_id, order_total_amount,
usd_order_total_amount, product_sale_amount,
is_deleted, is_freeze)
is_deleted, is_freeze, order_status
)
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},
......@@ -185,7 +187,8 @@
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER},
#{amountRefundUsd,jdbcType=DECIMAL}, #{companyId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL},
#{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL},
#{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT})
#{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT}, #{orderStatus,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
<!--
......@@ -269,6 +272,9 @@
<if test="isFreeze != null">
is_freeze,
</if>
<if test="orderStatus != null">
order_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -346,6 +352,9 @@
<if test="isFreeze != null">
#{isFreeze,jdbcType=BIT},
</if>
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultType="java.lang.Long">
......@@ -440,6 +449,9 @@
<if test="record.isFreeze != null">
is_freeze = #{record.isFreeze,jdbcType=BIT},
</if>
<if test="record.orderStatus != null">
order_status = #{record.orderStatus,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -475,7 +487,8 @@
usd_order_total_amount = #{record.usdOrderTotalAmount,jdbcType=DECIMAL},
product_sale_amount = #{record.productSaleAmount,jdbcType=DECIMAL},
is_deleted = #{record.isDeleted,jdbcType=BIT},
is_freeze = #{record.isFreeze,jdbcType=BIT}
is_freeze = #{record.isFreeze,jdbcType=BIT},
order_status = #{record.orderStatus,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -559,6 +572,9 @@
<if test="isFreeze != null">
is_freeze = #{isFreeze,jdbcType=BIT},
</if>
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -591,7 +607,8 @@
usd_order_total_amount = #{usdOrderTotalAmount,jdbcType=DECIMAL},
product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL},
is_deleted = #{isDeleted,jdbcType=BIT},
is_freeze = #{isFreeze,jdbcType=BIT}
is_freeze = #{isFreeze,jdbcType=BIT},
order_status = #{orderStatus,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
......@@ -677,6 +694,9 @@
<if test="isFreeze != null">
is_freeze,
</if>
<if test="orderStatus != null">
order_status,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -755,6 +775,9 @@
<if test="isFreeze != null">
#{isFreeze,jdbcType=BIT},
</if>
<if test="orderStatus != null">
#{orderStatus,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -833,6 +856,9 @@
<if test="isFreeze != null">
is_freeze = #{isFreeze,jdbcType=BIT},
</if>
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
......@@ -846,7 +872,7 @@
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,
amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount,
is_deleted, is_freeze)
is_deleted, is_freeze, order_status)
values
(#{id,jdbcType=INTEGER}, #{platformType,jdbcType=VARCHAR}, #{bailunAccount,jdbcType=VARCHAR},
#{bailunAccountId,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR},
......@@ -856,7 +882,8 @@
#{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER},
#{amountRefundUsd,jdbcType=DECIMAL}, #{companyId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL},
#{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL},
#{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT})
#{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT}, #{orderStatus,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
platform_type = #{platformType,jdbcType=VARCHAR},
......@@ -882,7 +909,8 @@
usd_order_total_amount = #{usdOrderTotalAmount,jdbcType=DECIMAL},
product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL},
is_deleted = #{isDeleted,jdbcType=BIT},
is_freeze = #{isFreeze,jdbcType=BIT}
is_freeze = #{isFreeze,jdbcType=BIT},
order_status = #{orderStatus,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceWishImpressionFeeMapper.xml
......@@ -12,6 +12,7 @@
<result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
<result column="fee_state" jdbcType="VARCHAR" property="feeState" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="record_time" jdbcType="DATE" property="recordTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -84,7 +85,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, campaign_id, amount, start_time, fee_state, end_time
id, campaign_id, amount, start_time, fee_state, end_time, record_time
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishImpressionFeeExample" resultMap="BaseResultMap">
<!--
......@@ -146,11 +147,11 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into dc_base_finance_wish_impression_fee (id, campaign_id, amount,
start_time, fee_state, end_time
)
start_time, fee_state, end_time,
record_time)
values (#{id,jdbcType=INTEGER}, #{campaignId,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL},
#{startTime,jdbcType=TIMESTAMP}, #{feeState,jdbcType=VARCHAR}, #{endTime,jdbcType=TIMESTAMP}
)
#{startTime,jdbcType=TIMESTAMP}, #{feeState,jdbcType=VARCHAR}, #{endTime,jdbcType=TIMESTAMP},
#{recordTime,jdbcType=DATE})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishImpressionFee">
<!--
......@@ -177,6 +178,9 @@
<if test="endTime != null">
end_time,
</if>
<if test="recordTime != null">
record_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -197,6 +201,9 @@
<if test="endTime != null">
#{endTime,jdbcType=TIMESTAMP},
</if>
<if test="recordTime != null">
#{recordTime,jdbcType=DATE},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishImpressionFeeExample" resultType="java.lang.Long">
......@@ -234,6 +241,9 @@
<if test="record.endTime != null">
end_time = #{record.endTime,jdbcType=TIMESTAMP},
</if>
<if test="record.recordTime != null">
record_time = #{record.recordTime,jdbcType=DATE},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -250,7 +260,8 @@
amount = #{record.amount,jdbcType=DECIMAL},
start_time = #{record.startTime,jdbcType=TIMESTAMP},
fee_state = #{record.feeState,jdbcType=VARCHAR},
end_time = #{record.endTime,jdbcType=TIMESTAMP}
end_time = #{record.endTime,jdbcType=TIMESTAMP},
record_time = #{record.recordTime,jdbcType=DATE}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -277,6 +288,9 @@
<if test="endTime != null">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="recordTime != null">
record_time = #{recordTime,jdbcType=DATE},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -290,7 +304,8 @@
amount = #{amount,jdbcType=DECIMAL},
start_time = #{startTime,jdbcType=TIMESTAMP},
fee_state = #{feeState,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=TIMESTAMP}
end_time = #{endTime,jdbcType=TIMESTAMP},
record_time = #{recordTime,jdbcType=DATE}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishImpressionFee">
......@@ -319,6 +334,9 @@
<if test="endTime != null">
end_time,
</if>
<if test="recordTime != null">
record_time,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -340,6 +358,9 @@
<if test="endTime != null">
#{endTime,jdbcType=TIMESTAMP},
</if>
<if test="recordTime != null">
#{recordTime,jdbcType=DATE},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -361,6 +382,9 @@
<if test="endTime != null">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="recordTime != null">
record_time = #{recordTime,jdbcType=DATE},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishImpressionFee">
......@@ -370,18 +394,19 @@
@project https://github.com/itfsw/mybatis-generator-plugin
-->
insert into dc_base_finance_wish_impression_fee
(id, campaign_id, amount, start_time, fee_state, end_time)
(id, campaign_id, amount, start_time, fee_state, end_time, record_time)
values
(#{id,jdbcType=INTEGER}, #{campaignId,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL},
#{startTime,jdbcType=TIMESTAMP}, #{feeState,jdbcType=VARCHAR}, #{endTime,jdbcType=TIMESTAMP}
)
#{startTime,jdbcType=TIMESTAMP}, #{feeState,jdbcType=VARCHAR}, #{endTime,jdbcType=TIMESTAMP},
#{recordTime,jdbcType=DATE})
on duplicate key update
id = #{id,jdbcType=INTEGER},
campaign_id = #{campaignId,jdbcType=VARCHAR},
amount = #{amount,jdbcType=DECIMAL},
start_time = #{startTime,jdbcType=TIMESTAMP},
fee_state = #{feeState,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=TIMESTAMP}
end_time = #{endTime,jdbcType=TIMESTAMP},
record_time = #{recordTime,jdbcType=DATE}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishImpressionFeeExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceWishProductMapper.xml
......@@ -11,6 +11,7 @@
<result column="keywords" jdbcType="VARCHAR" property="keywords" />
<result column="product_id" jdbcType="VARCHAR" property="productId" />
<result column="enrollment_fee" jdbcType="DECIMAL" property="enrollmentFee" />
<result column="record_time" jdbcType="DATE" property="recordTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -83,7 +84,7 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, campaign_id, keywords, product_id, enrollment_fee
id, campaign_id, keywords, product_id, enrollment_fee, record_time
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishProductExample" resultMap="BaseResultMap">
<!--
......@@ -145,9 +146,11 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into dc_base_finance_wish_product (id, campaign_id, keywords,
product_id, enrollment_fee)
product_id, enrollment_fee, record_time
)
values (#{id,jdbcType=INTEGER}, #{campaignId,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR},
#{productId,jdbcType=VARCHAR}, #{enrollmentFee,jdbcType=DECIMAL})
#{productId,jdbcType=VARCHAR}, #{enrollmentFee,jdbcType=DECIMAL}, #{recordTime,jdbcType=DATE}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishProduct">
<!--
......@@ -171,6 +174,9 @@
<if test="enrollmentFee != null">
enrollment_fee,
</if>
<if test="recordTime != null">
record_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -188,6 +194,9 @@
<if test="enrollmentFee != null">
#{enrollmentFee,jdbcType=DECIMAL},
</if>
<if test="recordTime != null">
#{recordTime,jdbcType=DATE},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishProductExample" resultType="java.lang.Long">
......@@ -222,6 +231,9 @@
<if test="record.enrollmentFee != null">
enrollment_fee = #{record.enrollmentFee,jdbcType=DECIMAL},
</if>
<if test="record.recordTime != null">
record_time = #{record.recordTime,jdbcType=DATE},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -237,7 +249,8 @@
campaign_id = #{record.campaignId,jdbcType=VARCHAR},
keywords = #{record.keywords,jdbcType=VARCHAR},
product_id = #{record.productId,jdbcType=VARCHAR},
enrollment_fee = #{record.enrollmentFee,jdbcType=DECIMAL}
enrollment_fee = #{record.enrollmentFee,jdbcType=DECIMAL},
record_time = #{record.recordTime,jdbcType=DATE}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -261,6 +274,9 @@
<if test="enrollmentFee != null">
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL},
</if>
<if test="recordTime != null">
record_time = #{recordTime,jdbcType=DATE},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -273,7 +289,8 @@
set campaign_id = #{campaignId,jdbcType=VARCHAR},
keywords = #{keywords,jdbcType=VARCHAR},
product_id = #{productId,jdbcType=VARCHAR},
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL}
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL},
record_time = #{recordTime,jdbcType=DATE}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishProduct">
......@@ -299,6 +316,9 @@
<if test="enrollmentFee != null">
enrollment_fee,
</if>
<if test="recordTime != null">
record_time,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -317,6 +337,9 @@
<if test="enrollmentFee != null">
#{enrollmentFee,jdbcType=DECIMAL},
</if>
<if test="recordTime != null">
#{recordTime,jdbcType=DATE},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -335,6 +358,9 @@
<if test="enrollmentFee != null">
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL},
</if>
<if test="recordTime != null">
record_time = #{recordTime,jdbcType=DATE},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseFinanceWishProduct">
......@@ -344,16 +370,18 @@
@project https://github.com/itfsw/mybatis-generator-plugin
-->
insert into dc_base_finance_wish_product
(id, campaign_id, keywords, product_id, enrollment_fee)
(id, campaign_id, keywords, product_id, enrollment_fee, record_time)
values
(#{id,jdbcType=INTEGER}, #{campaignId,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR},
#{productId,jdbcType=VARCHAR}, #{enrollmentFee,jdbcType=DECIMAL})
#{productId,jdbcType=VARCHAR}, #{enrollmentFee,jdbcType=DECIMAL}, #{recordTime,jdbcType=DATE}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
campaign_id = #{campaignId,jdbcType=VARCHAR},
keywords = #{keywords,jdbcType=VARCHAR},
product_id = #{productId,jdbcType=VARCHAR},
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL}
enrollment_fee = #{enrollmentFee,jdbcType=DECIMAL},
record_time = #{recordTime,jdbcType=DATE}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceWishProductExample" resultMap="BaseResultMap">
<!--
......
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