Skip to content

D
dc-java
Commit 5605ff04 by yinyong
Options

数据中心--同步oms新增产品备注、客户留言异常

parent 6dd0791a
Showing with 453 additions and 44 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -197,6 +197,8 @@ public class OrderSyncJob extends PointJob {
}
dcBaseOmsSku.setHasDelete(false);
dcBaseOmsSku.setHasScalp(dcBaseOmsOrder.getHasScalp());
dcBaseOmsSku.setHasBuyerRemark(dcBaseOmsOrder.getHasBuyerRemark());
dcBaseOmsSku.setHasPlatskuRemark(dcBaseOmsOrder.getHasPlatskuRemark());
/*
* dc_base_oms_sku字段赋值, 给初始值是为了避免nullPoint
*/
......@@ -691,6 +693,8 @@ public class OrderSyncJob extends PointJob {
private void listOrderExceptions(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
dcBaseOmsOrder.setHasScalp(false);
dcBaseOmsOrder.setHasBuyerRemark(false);
dcBaseOmsOrder.setHasPlatskuRemark(false);
List<OrderException> orderExceptions = omsResult.getOrderExceptions();
if (orderExceptions != null && orderExceptions.size() > 0) {
for (OrderException orderException : orderExceptions) {
......@@ -700,6 +704,18 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setHasScalp(true);
}
}
if (StringUtils.isNotBlank(orderException.getExceptionType()) && StringUtils.isNotBlank(orderException.getStatus()) && orderException.getExceptionType().equals(OrderExceptionType.BuyerRemark.value())) {
if (orderException.getStatus().equals(OrderExceptionStatus.UnHandle.value()) || orderException.getStatus().equals(OrderExceptionStatus.Handling.value())){
dcBaseOmsOrder.setHasBuyerRemark(true);
}
}
if (StringUtils.isNotBlank(orderException.getExceptionType()) && StringUtils.isNotBlank(orderException.getStatus()) && orderException.getExceptionType().equals(OrderExceptionType.PlatSkuRemark.value())) {
if (orderException.getStatus().equals(OrderExceptionStatus.UnHandle.value()) || orderException.getStatus().equals(OrderExceptionStatus.Handling.value())){
dcBaseOmsOrder.setHasPlatskuRemark(true);
}
}
}
}
}
......
data-base/base-sync-oms-order/src/main/resources/job.properties
......@@ -9,7 +9,7 @@ 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-oms-order-coroutine
#JOB_NAME=base-sync-oms-order
#JOB_NAME=base-sync-oms-order-coroutine
JOB_NAME=base-sync-oms-order
JOB_CRON=0/1 * * * * ? *
SHARDING_TOTAL_COUNT=1
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrder.java
......@@ -802,6 +802,24 @@ public class DcBaseOmsOrder {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.has_buyer_remark
*
* @mbg.generated
*/
private Boolean hasBuyerRemark;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.has_platsku_remark
*
* @mbg.generated
*/
private Boolean hasPlatskuRemark;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.has_innersale
*
* @mbg.generated
......@@ -998,6 +1016,8 @@ public class DcBaseOmsOrder {
sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append(", hasScalp=").append(hasScalp);
sb.append(", hasBuyerRemark=").append(hasBuyerRemark);
sb.append(", hasPlatskuRemark=").append(hasPlatskuRemark);
sb.append(", hasInnersale=").append(hasInnersale);
sb.append(", companyId=").append(companyId);
sb.append(", profitOms=").append(profitOms);
......@@ -1119,6 +1139,8 @@ public class DcBaseOmsOrder {
&& (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus()))
&& (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
&& (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (this.getHasBuyerRemark() == null ? other.getHasBuyerRemark() == null : this.getHasBuyerRemark().equals(other.getHasBuyerRemark()))
&& (this.getHasPlatskuRemark() == null ? other.getHasPlatskuRemark() == null : this.getHasPlatskuRemark().equals(other.getHasPlatskuRemark()))
&& (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()))
......@@ -1230,6 +1252,8 @@ public class DcBaseOmsOrder {
result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
result = prime * result + ((getHasBuyerRemark() == null) ? 0 : getHasBuyerRemark().hashCode());
result = prime * result + ((getHasPlatskuRemark() == null) ? 0 : getHasPlatskuRemark().hashCode());
result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getProfitOms() == null) ? 0 : getProfitOms().hashCode());
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
......@@ -910,6 +910,24 @@ public class DcBaseOmsSku {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.has_buyer_remark
*
* @mbg.generated
*/
private Boolean hasBuyerRemark;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.has_platsku_remark
*
* @mbg.generated
*/
private Boolean hasPlatskuRemark;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.logistics_method_code
*
* @mbg.generated
......@@ -1127,6 +1145,8 @@ public class DcBaseOmsSku {
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append(", hasDelete=").append(hasDelete);
sb.append(", hasScalp=").append(hasScalp);
sb.append(", hasBuyerRemark=").append(hasBuyerRemark);
sb.append(", hasPlatskuRemark=").append(hasPlatskuRemark);
sb.append(", logisticsMethodCode=").append(logisticsMethodCode);
sb.append(", logisticsMethodName=").append(logisticsMethodName);
sb.append(", hasInnersale=").append(hasInnersale);
......@@ -1261,6 +1281,8 @@ public class DcBaseOmsSku {
&& (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
&& (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
&& (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (this.getHasBuyerRemark() == null ? other.getHasBuyerRemark() == null : this.getHasBuyerRemark().equals(other.getHasBuyerRemark()))
&& (this.getHasPlatskuRemark() == null ? other.getHasPlatskuRemark() == null : this.getHasPlatskuRemark().equals(other.getHasPlatskuRemark()))
&& (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
&& (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName()))
&& (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
......@@ -1385,6 +1407,8 @@ public class DcBaseOmsSku {
result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
result = prime * result + ((getHasBuyerRemark() == null) ? 0 : getHasBuyerRemark().hashCode());
result = prime * result + ((getHasPlatskuRemark() == null) ? 0 : getHasPlatskuRemark().hashCode());
result = prime * result + ((getLogisticsMethodCode() == null) ? 0 : getLogisticsMethodCode().hashCode());
result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java
......@@ -6061,6 +6061,126 @@ public class DcBaseOmsOrderExample {
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIsNull() {
addCriterion("has_buyer_remark is null");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIsNotNull() {
addCriterion("has_buyer_remark is not null");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkEqualTo(Boolean value) {
addCriterion("has_buyer_remark =", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotEqualTo(Boolean value) {
addCriterion("has_buyer_remark <>", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkGreaterThan(Boolean value) {
addCriterion("has_buyer_remark >", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_buyer_remark >=", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkLessThan(Boolean value) {
addCriterion("has_buyer_remark <", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkLessThanOrEqualTo(Boolean value) {
addCriterion("has_buyer_remark <=", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIn(List<Boolean> values) {
addCriterion("has_buyer_remark in", values, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotIn(List<Boolean> values) {
addCriterion("has_buyer_remark not in", values, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkBetween(Boolean value1, Boolean value2) {
addCriterion("has_buyer_remark between", value1, value2, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_buyer_remark not between", value1, value2, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIsNull() {
addCriterion("has_platsku_remark is null");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIsNotNull() {
addCriterion("has_platsku_remark is not null");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkEqualTo(Boolean value) {
addCriterion("has_platsku_remark =", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotEqualTo(Boolean value) {
addCriterion("has_platsku_remark <>", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkGreaterThan(Boolean value) {
addCriterion("has_platsku_remark >", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_platsku_remark >=", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkLessThan(Boolean value) {
addCriterion("has_platsku_remark <", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkLessThanOrEqualTo(Boolean value) {
addCriterion("has_platsku_remark <=", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIn(List<Boolean> values) {
addCriterion("has_platsku_remark in", values, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotIn(List<Boolean> values) {
addCriterion("has_platsku_remark not in", values, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkBetween(Boolean value1, Boolean value2) {
addCriterion("has_platsku_remark between", value1, value2, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_platsku_remark not between", value1, value2, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasInnersaleIsNull() {
addCriterion("has_innersale is null");
return (Criteria) this;
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
......@@ -6811,6 +6811,126 @@ public class DcBaseOmsSkuExample {
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIsNull() {
addCriterion("has_buyer_remark is null");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIsNotNull() {
addCriterion("has_buyer_remark is not null");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkEqualTo(Boolean value) {
addCriterion("has_buyer_remark =", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotEqualTo(Boolean value) {
addCriterion("has_buyer_remark <>", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkGreaterThan(Boolean value) {
addCriterion("has_buyer_remark >", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_buyer_remark >=", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkLessThan(Boolean value) {
addCriterion("has_buyer_remark <", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkLessThanOrEqualTo(Boolean value) {
addCriterion("has_buyer_remark <=", value, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkIn(List<Boolean> values) {
addCriterion("has_buyer_remark in", values, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotIn(List<Boolean> values) {
addCriterion("has_buyer_remark not in", values, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkBetween(Boolean value1, Boolean value2) {
addCriterion("has_buyer_remark between", value1, value2, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasBuyerRemarkNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_buyer_remark not between", value1, value2, "hasBuyerRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIsNull() {
addCriterion("has_platsku_remark is null");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIsNotNull() {
addCriterion("has_platsku_remark is not null");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkEqualTo(Boolean value) {
addCriterion("has_platsku_remark =", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotEqualTo(Boolean value) {
addCriterion("has_platsku_remark <>", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkGreaterThan(Boolean value) {
addCriterion("has_platsku_remark >", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_platsku_remark >=", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkLessThan(Boolean value) {
addCriterion("has_platsku_remark <", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkLessThanOrEqualTo(Boolean value) {
addCriterion("has_platsku_remark <=", value, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkIn(List<Boolean> values) {
addCriterion("has_platsku_remark in", values, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotIn(List<Boolean> values) {
addCriterion("has_platsku_remark not in", values, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkBetween(Boolean value1, Boolean value2) {
addCriterion("has_platsku_remark between", value1, value2, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andHasPlatskuRemarkNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_platsku_remark not between", value1, value2, "hasPlatskuRemark");
return (Criteria) this;
}
public Criteria andLogisticsMethodCodeIsNull() {
addCriterion("logistics_method_code is null");
return (Criteria) this;
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml
......@@ -94,6 +94,8 @@
<result column="bailun_picking_status" jdbcType="VARCHAR" property="bailunPickingStatus" />
<result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
<result column="has_scalp" jdbcType="BIT" property="hasScalp" />
<result column="has_buyer_remark" jdbcType="BIT" property="hasBuyerRemark" />
<result column="has_platsku_remark" jdbcType="BIT" property="hasPlatskuRemark" />
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="profit_oms" jdbcType="DECIMAL" property="profitOms" />
......@@ -194,8 +196,9 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
has_scalp, has_buyer_remark, has_platsku_remark, has_innersale, company_id, profit_oms,
refund_obj, refund_type, refund_reference_id, has_fba_s, amount_general_cargo, aftermerged_bailun_order_no,
has_fba_fee, has_transfer_order
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -288,11 +291,11 @@
logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name,
bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id,
profit_oms, refund_obj, refund_type,
refund_reference_id, has_fba_s, amount_general_cargo,
aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
)
has_scalp, has_buyer_remark, has_platsku_remark,
has_innersale, company_id, profit_oms,
refund_obj, refund_type, refund_reference_id,
has_fba_s, amount_general_cargo, aftermerged_bailun_order_no,
has_fba_fee, has_transfer_order)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -325,11 +328,11 @@
#{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR},
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}
)
#{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT}, #{hasPlatskuRemark,jdbcType=BIT},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{profitOms,jdbcType=DECIMAL},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR},
#{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!--
......@@ -602,6 +605,12 @@
<if test="hasScalp != null">
has_scalp,
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark,
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark,
</if>
<if test="hasInnersale != null">
has_innersale,
</if>
......@@ -901,6 +910,12 @@
<if test="hasScalp != null">
#{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
#{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
#{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT},
</if>
......@@ -1217,6 +1232,12 @@
<if test="record.hasScalp != null">
has_scalp = #{record.hasScalp,jdbcType=BIT},
</if>
<if test="record.hasBuyerRemark != null">
has_buyer_remark = #{record.hasBuyerRemark,jdbcType=BIT},
</if>
<if test="record.hasPlatskuRemark != null">
has_platsku_remark = #{record.hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="record.hasInnersale != null">
has_innersale = #{record.hasInnersale,jdbcType=BIT},
</if>
......@@ -1349,6 +1370,8 @@
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
has_scalp = #{record.hasScalp,jdbcType=BIT},
has_buyer_remark = #{record.hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{record.hasPlatskuRemark,jdbcType=BIT},
has_innersale = #{record.hasInnersale,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER},
profit_oms = #{record.profitOms,jdbcType=DECIMAL},
......@@ -1632,6 +1655,12 @@
<if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT},
</if>
......@@ -1761,6 +1790,8 @@
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_scalp = #{hasScalp,jdbcType=BIT},
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
profit_oms = #{profitOms,jdbcType=DECIMAL},
......@@ -2046,6 +2077,12 @@
<if test="hasScalp != null">
has_scalp,
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark,
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark,
</if>
<if test="hasInnersale != null">
has_innersale,
</if>
......@@ -2346,6 +2383,12 @@
<if test="hasScalp != null">
#{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
#{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
#{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT},
</if>
......@@ -2646,6 +2689,12 @@
<if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT},
</if>
......@@ -2705,9 +2754,9 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
)
has_scalp, has_buyer_remark, has_platsku_remark, has_innersale, company_id, profit_oms,
refund_obj, refund_type, refund_reference_id, has_fba_s, amount_general_cargo,
aftermerged_bailun_order_no, has_fba_fee, has_transfer_order)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2741,11 +2790,11 @@
#{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR},
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}
)
#{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT}, #{hasPlatskuRemark,jdbcType=BIT},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{profitOms,jdbcType=DECIMAL},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR},
#{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2835,6 +2884,8 @@
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_scalp = #{hasScalp,jdbcType=BIT},
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
profit_oms = #{profitOms,jdbcType=DECIMAL},
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
......@@ -106,6 +106,8 @@
<result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
<result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="has_scalp" jdbcType="BIT" property="hasScalp" />
<result column="has_buyer_remark" jdbcType="BIT" property="hasBuyerRemark" />
<result column="has_platsku_remark" jdbcType="BIT" property="hasPlatskuRemark" />
<result column="logistics_method_code" jdbcType="VARCHAR" property="logisticsMethodCode" />
<result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" />
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
......@@ -209,9 +211,9 @@
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo, has_transfer_order
has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -308,11 +310,12 @@
bailun_category_id, bailun_category_name, gmt_create,
gmt_modified, ratio_weight, ratio_price,
bailun_picking_status, bailun_require_logistics,
has_delete, has_scalp, logistics_method_code,
logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type,
refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo, has_transfer_order)
has_delete, has_scalp, has_buyer_remark,
has_platsku_remark, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status,
refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo,
has_transfer_order)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -349,11 +352,12 @@
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL}, #{hasTransferOrder,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT},
#{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{hasTransferOrder,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -662,6 +666,12 @@
<if test="hasScalp != null">
has_scalp,
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark,
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark,
</if>
<if test="logisticsMethodCode != null">
logistics_method_code,
</if>
......@@ -1000,6 +1010,12 @@
<if test="hasScalp != null">
#{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
#{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
#{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="logisticsMethodCode != null">
#{logisticsMethodCode,jdbcType=VARCHAR},
</if>
......@@ -1355,6 +1371,12 @@
<if test="record.hasScalp != null">
has_scalp = #{record.hasScalp,jdbcType=BIT},
</if>
<if test="record.hasBuyerRemark != null">
has_buyer_remark = #{record.hasBuyerRemark,jdbcType=BIT},
</if>
<if test="record.hasPlatskuRemark != null">
has_platsku_remark = #{record.hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="record.logisticsMethodCode != null">
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
</if>
......@@ -1502,6 +1524,8 @@
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{record.hasDelete,jdbcType=BIT},
has_scalp = #{record.hasScalp,jdbcType=BIT},
has_buyer_remark = #{record.hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{record.hasPlatskuRemark,jdbcType=BIT},
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{record.hasInnersale,jdbcType=BIT},
......@@ -1822,6 +1846,12 @@
<if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="logisticsMethodCode != null">
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
</if>
......@@ -1966,6 +1996,8 @@
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT},
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT},
......@@ -2288,6 +2320,12 @@
<if test="hasScalp != null">
has_scalp,
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark,
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark,
</if>
<if test="logisticsMethodCode != null">
logistics_method_code,
</if>
......@@ -2627,6 +2665,12 @@
<if test="hasScalp != null">
#{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
#{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
#{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="logisticsMethodCode != null">
#{logisticsMethodCode,jdbcType=VARCHAR},
</if>
......@@ -2966,6 +3010,12 @@
<if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT},
</if>
<if test="hasBuyerRemark != null">
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
</if>
<if test="hasPlatskuRemark != null">
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
</if>
<if test="logisticsMethodCode != null">
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
</if>
......@@ -3030,10 +3080,10 @@
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name,
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id,
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order
)
bailun_require_logistics, has_delete, has_scalp, has_buyer_remark, has_platsku_remark,
logistics_method_code, logistics_method_name, has_innersale, company_id, bailun_refund_status,
refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo, has_transfer_order)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -3071,11 +3121,12 @@
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL}, #{hasTransferOrder,jdbcType=BIT})
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT},
#{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{hasTransferOrder,jdbcType=BIT})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -3177,6 +3228,8 @@
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT},
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT},
......
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