Commit 75eb963a by yinyong

OMS订单--是否手工单字段新增

parent 9ea3c937
...@@ -435,6 +435,7 @@ public class OrderSyncJob extends PointJob { ...@@ -435,6 +435,7 @@ public class OrderSyncJob extends PointJob {
//SKU只放单个利润 //SKU只放单个利润
dcBaseOmsSku.setProfitTotal(unitSkuProfit); dcBaseOmsSku.setProfitTotal(unitSkuProfit);
dcBaseOmsSku.setHasInnersale(dcBaseOmsOrder.getHasInnersale()); dcBaseOmsSku.setHasInnersale(dcBaseOmsOrder.getHasInnersale());
dcBaseOmsSku.setHasTransferOrder(dcBaseOmsOrder.getHasTransferOrder());
if (skuAmountSalesRMB.compareTo(BigDecimal.ZERO) == 0) { if (skuAmountSalesRMB.compareTo(BigDecimal.ZERO) == 0) {
dcBaseOmsSku.setProfitRate(BigDecimal.ZERO); dcBaseOmsSku.setProfitRate(BigDecimal.ZERO);
} else { } else {
...@@ -1066,6 +1067,7 @@ public class OrderSyncJob extends PointJob { ...@@ -1066,6 +1067,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setOrderUpdateTime(omsResult.getOrderUpdateTime()); dcBaseOmsOrder.setOrderUpdateTime(omsResult.getOrderUpdateTime());
dcBaseOmsOrder.setBailunPickingStatus(omsResult.getBailunPickingStatus()); dcBaseOmsOrder.setBailunPickingStatus(omsResult.getBailunPickingStatus());
dcBaseOmsOrder.setBailunRequireLogistics(omsResult.getBailunRequireLogistics()); dcBaseOmsOrder.setBailunRequireLogistics(omsResult.getBailunRequireLogistics());
dcBaseOmsOrder.setHasTransferOrder(omsResult.getHasTransferOrder());
//礼品包装收入 //礼品包装收入
dcBaseOmsOrder.setAmountGiftWrap((omsResult.getOrderCharge().getAmountGiftWrap() != null && omsResult.getOrderCharge().getAmountGiftWrap().getAmount() != null) ? omsResult.getOrderCharge().getAmountGiftWrap().getAmount() : BigDecimal.ZERO); dcBaseOmsOrder.setAmountGiftWrap((omsResult.getOrderCharge().getAmountGiftWrap() != null && omsResult.getOrderCharge().getAmountGiftWrap().getAmount() != null) ? omsResult.getOrderCharge().getAmountGiftWrap().getAmount() : BigDecimal.ZERO);
//总收入 //总收入
......
...@@ -890,6 +890,15 @@ public class DcBaseOmsOrder { ...@@ -890,6 +890,15 @@ public class DcBaseOmsOrder {
private Boolean hasFbaFee; private Boolean hasFbaFee;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.has_transfer_order
*
* @mbg.generated
*/
private Boolean hasTransferOrder;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_order * This method corresponds to the database table dc_base_oms_order
* *
...@@ -999,6 +1008,7 @@ public class DcBaseOmsOrder { ...@@ -999,6 +1008,7 @@ public class DcBaseOmsOrder {
sb.append(", amountGeneralCargo=").append(amountGeneralCargo); sb.append(", amountGeneralCargo=").append(amountGeneralCargo);
sb.append(", aftermergedBailunOrderNo=").append(aftermergedBailunOrderNo); sb.append(", aftermergedBailunOrderNo=").append(aftermergedBailunOrderNo);
sb.append(", hasFbaFee=").append(hasFbaFee); sb.append(", hasFbaFee=").append(hasFbaFee);
sb.append(", hasTransferOrder=").append(hasTransferOrder);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -1118,7 +1128,8 @@ public class DcBaseOmsOrder { ...@@ -1118,7 +1128,8 @@ public class DcBaseOmsOrder {
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS())) && (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
&& (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo())) && (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()))
&& (this.getAftermergedBailunOrderNo() == null ? other.getAftermergedBailunOrderNo() == null : this.getAftermergedBailunOrderNo().equals(other.getAftermergedBailunOrderNo())) && (this.getAftermergedBailunOrderNo() == null ? other.getAftermergedBailunOrderNo() == null : this.getAftermergedBailunOrderNo().equals(other.getAftermergedBailunOrderNo()))
&& (this.getHasFbaFee() == null ? other.getHasFbaFee() == null : this.getHasFbaFee().equals(other.getHasFbaFee())); && (this.getHasFbaFee() == null ? other.getHasFbaFee() == null : this.getHasFbaFee().equals(other.getHasFbaFee()))
&& (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()));
} }
/** /**
...@@ -1229,6 +1240,7 @@ public class DcBaseOmsOrder { ...@@ -1229,6 +1240,7 @@ public class DcBaseOmsOrder {
result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode()); result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode());
result = prime * result + ((getAftermergedBailunOrderNo() == null) ? 0 : getAftermergedBailunOrderNo().hashCode()); result = prime * result + ((getAftermergedBailunOrderNo() == null) ? 0 : getAftermergedBailunOrderNo().hashCode());
result = prime * result + ((getHasFbaFee() == null) ? 0 : getHasFbaFee().hashCode()); result = prime * result + ((getHasFbaFee() == null) ? 0 : getHasFbaFee().hashCode());
result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -1007,6 +1007,15 @@ public class DcBaseOmsSku { ...@@ -1007,6 +1007,15 @@ public class DcBaseOmsSku {
private BigDecimal amountGeneralCargo; private BigDecimal amountGeneralCargo;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.has_transfer_order
*
* @mbg.generated
*/
private Boolean hasTransferOrder;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku * This method corresponds to the database table dc_base_oms_sku
* *
...@@ -1129,6 +1138,7 @@ public class DcBaseOmsSku { ...@@ -1129,6 +1138,7 @@ public class DcBaseOmsSku {
sb.append(", hasFbaS=").append(hasFbaS); sb.append(", hasFbaS=").append(hasFbaS);
sb.append(", bailunSkuQuantityPushed=").append(bailunSkuQuantityPushed); sb.append(", bailunSkuQuantityPushed=").append(bailunSkuQuantityPushed);
sb.append(", amountGeneralCargo=").append(amountGeneralCargo); sb.append(", amountGeneralCargo=").append(amountGeneralCargo);
sb.append(", hasTransferOrder=").append(hasTransferOrder);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -1261,7 +1271,8 @@ public class DcBaseOmsSku { ...@@ -1261,7 +1271,8 @@ public class DcBaseOmsSku {
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId())) && (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS())) && (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
&& (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed())) && (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed()))
&& (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo())); && (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()))
&& (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()));
} }
/** /**
...@@ -1385,6 +1396,7 @@ public class DcBaseOmsSku { ...@@ -1385,6 +1396,7 @@ public class DcBaseOmsSku {
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode()); result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
result = prime * result + ((getBailunSkuQuantityPushed() == null) ? 0 : getBailunSkuQuantityPushed().hashCode()); result = prime * result + ((getBailunSkuQuantityPushed() == null) ? 0 : getBailunSkuQuantityPushed().hashCode());
result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode()); result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode());
result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -6700,6 +6700,66 @@ public class DcBaseOmsOrderExample { ...@@ -6700,6 +6700,66 @@ public class DcBaseOmsOrderExample {
addCriterion("has_fba_fee not between", value1, value2, "hasFbaFee"); addCriterion("has_fba_fee not between", value1, value2, "hasFbaFee");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andHasTransferOrderIsNull() {
addCriterion("has_transfer_order is null");
return (Criteria) this;
}
public Criteria andHasTransferOrderIsNotNull() {
addCriterion("has_transfer_order is not null");
return (Criteria) this;
}
public Criteria andHasTransferOrderEqualTo(Boolean value) {
addCriterion("has_transfer_order =", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotEqualTo(Boolean value) {
addCriterion("has_transfer_order <>", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderGreaterThan(Boolean value) {
addCriterion("has_transfer_order >", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_transfer_order >=", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderLessThan(Boolean value) {
addCriterion("has_transfer_order <", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderLessThanOrEqualTo(Boolean value) {
addCriterion("has_transfer_order <=", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderIn(List<Boolean> values) {
addCriterion("has_transfer_order in", values, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotIn(List<Boolean> values) {
addCriterion("has_transfer_order not in", values, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderBetween(Boolean value1, Boolean value2) {
addCriterion("has_transfer_order between", value1, value2, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_transfer_order not between", value1, value2, "hasTransferOrder");
return (Criteria) this;
}
} }
/** /**
......
...@@ -7530,6 +7530,66 @@ public class DcBaseOmsSkuExample { ...@@ -7530,6 +7530,66 @@ public class DcBaseOmsSkuExample {
addCriterion("amount_general_cargo not between", value1, value2, "amountGeneralCargo"); addCriterion("amount_general_cargo not between", value1, value2, "amountGeneralCargo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andHasTransferOrderIsNull() {
addCriterion("has_transfer_order is null");
return (Criteria) this;
}
public Criteria andHasTransferOrderIsNotNull() {
addCriterion("has_transfer_order is not null");
return (Criteria) this;
}
public Criteria andHasTransferOrderEqualTo(Boolean value) {
addCriterion("has_transfer_order =", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotEqualTo(Boolean value) {
addCriterion("has_transfer_order <>", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderGreaterThan(Boolean value) {
addCriterion("has_transfer_order >", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_transfer_order >=", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderLessThan(Boolean value) {
addCriterion("has_transfer_order <", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderLessThanOrEqualTo(Boolean value) {
addCriterion("has_transfer_order <=", value, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderIn(List<Boolean> values) {
addCriterion("has_transfer_order in", values, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotIn(List<Boolean> values) {
addCriterion("has_transfer_order not in", values, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderBetween(Boolean value1, Boolean value2) {
addCriterion("has_transfer_order between", value1, value2, "hasTransferOrder");
return (Criteria) this;
}
public Criteria andHasTransferOrderNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_transfer_order not between", value1, value2, "hasTransferOrder");
return (Criteria) this;
}
} }
/** /**
......
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
<result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" /> <result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" />
<result column="aftermerged_bailun_order_no" jdbcType="VARCHAR" property="aftermergedBailunOrderNo" /> <result column="aftermerged_bailun_order_no" jdbcType="VARCHAR" property="aftermergedBailunOrderNo" />
<result column="has_fba_fee" jdbcType="BIT" property="hasFbaFee" /> <result column="has_fba_fee" jdbcType="BIT" property="hasFbaFee" />
<result column="has_transfer_order" jdbcType="BIT" property="hasTransferOrder" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -194,7 +195,7 @@ ...@@ -194,7 +195,7 @@
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 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_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_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -290,7 +291,8 @@ ...@@ -290,7 +291,8 @@
has_scalp, has_innersale, company_id, has_scalp, has_innersale, company_id,
profit_oms, refund_obj, refund_type, profit_oms, refund_obj, refund_type,
refund_reference_id, has_fba_s, amount_general_cargo, refund_reference_id, has_fba_s, amount_general_cargo,
aftermerged_bailun_order_no, has_fba_fee) aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
...@@ -326,7 +328,8 @@ ...@@ -326,7 +328,8 @@
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}) #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!-- <!--
...@@ -629,6 +632,9 @@ ...@@ -629,6 +632,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
has_fba_fee, has_fba_fee,
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -925,6 +931,9 @@ ...@@ -925,6 +931,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
#{hasFbaFee,jdbcType=BIT}, #{hasFbaFee,jdbcType=BIT},
</if> </if>
<if test="hasTransferOrder != null">
#{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
...@@ -1238,6 +1247,9 @@ ...@@ -1238,6 +1247,9 @@
<if test="record.hasFbaFee != null"> <if test="record.hasFbaFee != null">
has_fba_fee = #{record.hasFbaFee,jdbcType=BIT}, has_fba_fee = #{record.hasFbaFee,jdbcType=BIT},
</if> </if>
<if test="record.hasTransferOrder != null">
has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -1346,7 +1358,8 @@ ...@@ -1346,7 +1358,8 @@
has_fba_s = #{record.hasFbaS,jdbcType=BIT}, has_fba_s = #{record.hasFbaS,jdbcType=BIT},
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
aftermerged_bailun_order_no = #{record.aftermergedBailunOrderNo,jdbcType=VARCHAR}, aftermerged_bailun_order_no = #{record.aftermergedBailunOrderNo,jdbcType=VARCHAR},
has_fba_fee = #{record.hasFbaFee,jdbcType=BIT} has_fba_fee = #{record.hasFbaFee,jdbcType=BIT},
has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1649,6 +1662,9 @@ ...@@ -1649,6 +1662,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
has_fba_fee = #{hasFbaFee,jdbcType=BIT}, has_fba_fee = #{hasFbaFee,jdbcType=BIT},
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1754,7 +1770,8 @@ ...@@ -1754,7 +1770,8 @@
has_fba_s = #{hasFbaS,jdbcType=BIT}, has_fba_s = #{hasFbaS,jdbcType=BIT},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR},
has_fba_fee = #{hasFbaFee,jdbcType=BIT} has_fba_fee = #{hasFbaFee,jdbcType=BIT},
has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
...@@ -2059,6 +2076,9 @@ ...@@ -2059,6 +2076,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
has_fba_fee, has_fba_fee,
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -2356,6 +2376,9 @@ ...@@ -2356,6 +2376,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
#{hasFbaFee,jdbcType=BIT}, #{hasFbaFee,jdbcType=BIT},
</if> </if>
<if test="hasTransferOrder != null">
#{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -2653,6 +2676,9 @@ ...@@ -2653,6 +2676,9 @@
<if test="hasFbaFee != null"> <if test="hasFbaFee != null">
has_fba_fee = #{hasFbaFee,jdbcType=BIT}, has_fba_fee = #{hasFbaFee,jdbcType=BIT},
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
...@@ -2680,7 +2706,8 @@ ...@@ -2680,7 +2706,8 @@
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 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_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_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order
)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
...@@ -2717,7 +2744,8 @@ ...@@ -2717,7 +2744,8 @@
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}) #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}
)
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR}, origin_order_id = #{originOrderId,jdbcType=VARCHAR},
...@@ -2816,7 +2844,8 @@ ...@@ -2816,7 +2844,8 @@
has_fba_s = #{hasFbaS,jdbcType=BIT}, has_fba_s = #{hasFbaS,jdbcType=BIT},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR},
has_fba_fee = #{hasFbaFee,jdbcType=BIT} has_fba_fee = #{hasFbaFee,jdbcType=BIT},
has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!-- <!--
......
...@@ -117,6 +117,7 @@ ...@@ -117,6 +117,7 @@
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" /> <result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
<result column="bailun_sku_quantity_pushed" jdbcType="INTEGER" property="bailunSkuQuantityPushed" /> <result column="bailun_sku_quantity_pushed" jdbcType="INTEGER" property="bailunSkuQuantityPushed" />
<result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" /> <result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" />
<result column="has_transfer_order" jdbcType="BIT" property="hasTransferOrder" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id, 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, bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo amount_general_cargo, has_transfer_order
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -311,7 +312,7 @@ ...@@ -311,7 +312,7 @@
logistics_method_name, has_innersale, company_id, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, bailun_refund_status, refund_obj, refund_type,
refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo) amount_general_cargo, has_transfer_order)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
...@@ -352,7 +353,7 @@ ...@@ -352,7 +353,7 @@
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL}) #{amountGeneralCargo,jdbcType=DECIMAL}, #{hasTransferOrder,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!-- <!--
...@@ -694,6 +695,9 @@ ...@@ -694,6 +695,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
amount_general_cargo, amount_general_cargo,
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -1029,6 +1033,9 @@ ...@@ -1029,6 +1033,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL}, #{amountGeneralCargo,jdbcType=DECIMAL},
</if> </if>
<if test="hasTransferOrder != null">
#{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
...@@ -1381,6 +1388,9 @@ ...@@ -1381,6 +1388,9 @@
<if test="record.amountGeneralCargo != null"> <if test="record.amountGeneralCargo != null">
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
</if> </if>
<if test="record.hasTransferOrder != null">
has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -1502,7 +1512,8 @@ ...@@ -1502,7 +1512,8 @@
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR}, refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT}, has_fba_s = #{record.hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER}, bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL} amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1844,6 +1855,9 @@ ...@@ -1844,6 +1855,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1962,7 +1976,8 @@ ...@@ -1962,7 +1976,8 @@
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}, refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}, has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}, bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL} amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
...@@ -2306,6 +2321,9 @@ ...@@ -2306,6 +2321,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
amount_general_cargo, amount_general_cargo,
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -2642,6 +2660,9 @@ ...@@ -2642,6 +2660,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL}, #{amountGeneralCargo,jdbcType=DECIMAL},
</if> </if>
<if test="hasTransferOrder != null">
#{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -2978,6 +2999,9 @@ ...@@ -2978,6 +2999,9 @@
<if test="amountGeneralCargo != null"> <if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if> </if>
<if test="hasTransferOrder != null">
has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
...@@ -3008,7 +3032,8 @@ ...@@ -3008,7 +3032,8 @@
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, 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, 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_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo) has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order
)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
...@@ -3050,7 +3075,7 @@ ...@@ -3050,7 +3075,7 @@
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL}) #{amountGeneralCargo,jdbcType=DECIMAL}, #{hasTransferOrder,jdbcType=BIT})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR}, origin_order_id = #{originOrderId,jdbcType=VARCHAR},
...@@ -3162,7 +3187,8 @@ ...@@ -3162,7 +3187,8 @@
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}, refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}, has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}, bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL} amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" 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