Skip to content

D
dc-java
Commit 9b39ab6b by wutong
Options

同步物流单费用新增调拨单号

parent 6b00e9c2
Showing with 123 additions and 9 deletions
data-base/base-sync-cost-first/src/main/java/com/bailuntec/domain/pojo/CostFirstData.java
......@@ -10,6 +10,8 @@ import java.util.List;
public class CostFirstData {
@JSONField(name = "channelOrderNo")
private String channelOrderId;
@JSONField(name = "orderCode")
private String transferOrderId;
@JSONField(name = "id")
private Integer channelId;
@JSONField(name = "boxCode")
......
data-base/base-sync-cost-first/src/main/java/com/bailuntec/job/SyncCostFirstJob.java
......@@ -82,6 +82,7 @@ public class SyncCostFirstJob extends PointJob {
try {
DcBaseCostFirstMapper baseCostFirstMapper = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
for (CostFirstData costFirstData : costFirstDataList) {
//将费用处理一下, 给过来的数据很长的小数
costFirstData.setCostDuty(costFirstData.getCostDuty().setScale(3, RoundingMode.HALF_EVEN));
costFirstData.setCostCustomsClearance(costFirstData.getCostCustomsClearance().setScale(3, RoundingMode.HALF_EVEN));
costFirstData.setCostGoodsClearance(costFirstData.getCostGoodsClearance().setScale(3, RoundingMode.HALF_EVEN));
......
data-base/base-sync-cost-first/src/main/java/com/bailuntec/mapper/DcBaseCostFirstMapper.xml
......@@ -20,6 +20,7 @@
<result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" />
<result column="quantity" jdbcType="INTEGER" property="quantity" />
<result column="sku_weight" jdbcType="DECIMAL" property="skuWeight" />
<result column="transfer_order_id" jdbcType="VARCHAR" property="transferOrderId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -94,7 +95,7 @@
-->
id, channel_order_id, channel_id, box_id, cost_first, cost_goods_clearance, cost_duty,
cost_customs_clearance, cost_weight, cost_fuel, warehouse_code, bailun_sku, quantity,
sku_weight
sku_weight, transfer_order_id
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
<!--
......@@ -159,12 +160,14 @@
box_id, cost_first, cost_goods_clearance,
cost_duty, cost_customs_clearance, cost_weight,
cost_fuel, warehouse_code, bailun_sku,
quantity, sku_weight)
quantity, sku_weight, transfer_order_id
)
values (#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER},
#{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{costGoodsClearance,jdbcType=DECIMAL},
#{costDuty,jdbcType=DECIMAL}, #{costCustomsClearance,jdbcType=DECIMAL}, #{costWeight,jdbcType=DECIMAL},
#{costFuel,jdbcType=DECIMAL}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL})
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL}, #{transferOrderId,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
<!--
......@@ -215,6 +218,9 @@
<if test="skuWeight != null">
sku_weight,
</if>
<if test="transferOrderId != null">
transfer_order_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -259,6 +265,9 @@
<if test="skuWeight != null">
#{skuWeight,jdbcType=DECIMAL},
</if>
<if test="transferOrderId != null">
#{transferOrderId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultType="java.lang.Long">
......@@ -320,6 +329,9 @@
<if test="record.skuWeight != null">
sku_weight = #{record.skuWeight,jdbcType=DECIMAL},
</if>
<if test="record.transferOrderId != null">
transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -344,7 +356,8 @@
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
quantity = #{record.quantity,jdbcType=INTEGER},
sku_weight = #{record.skuWeight,jdbcType=DECIMAL}
sku_weight = #{record.skuWeight,jdbcType=DECIMAL},
transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -395,6 +408,9 @@
<if test="skuWeight != null">
sku_weight = #{skuWeight,jdbcType=DECIMAL},
</if>
<if test="transferOrderId != null">
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -416,7 +432,8 @@
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
quantity = #{quantity,jdbcType=INTEGER},
sku_weight = #{skuWeight,jdbcType=DECIMAL}
sku_weight = #{skuWeight,jdbcType=DECIMAL},
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
......@@ -469,6 +486,9 @@
<if test="skuWeight != null">
sku_weight,
</if>
<if test="transferOrderId != null">
transfer_order_id,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -514,6 +534,9 @@
<if test="skuWeight != null">
#{skuWeight,jdbcType=DECIMAL},
</if>
<if test="transferOrderId != null">
#{transferOrderId,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -559,6 +582,9 @@
<if test="skuWeight != null">
sku_weight = #{skuWeight,jdbcType=DECIMAL},
</if>
<if test="transferOrderId != null">
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
......@@ -570,13 +596,14 @@
insert into dc_base_cost_first
(id, channel_order_id, channel_id, box_id, cost_first, cost_goods_clearance, cost_duty,
cost_customs_clearance, cost_weight, cost_fuel, warehouse_code, bailun_sku, quantity,
sku_weight)
sku_weight, transfer_order_id)
values
(#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER},
#{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{costGoodsClearance,jdbcType=DECIMAL},
#{costDuty,jdbcType=DECIMAL}, #{costCustomsClearance,jdbcType=DECIMAL}, #{costWeight,jdbcType=DECIMAL},
#{costFuel,jdbcType=DECIMAL}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL})
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL}, #{transferOrderId,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
channel_order_id = #{channelOrderId,jdbcType=VARCHAR},
......@@ -591,7 +618,8 @@
warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
quantity = #{quantity,jdbcType=INTEGER},
sku_weight = #{skuWeight,jdbcType=DECIMAL}
sku_weight = #{skuWeight,jdbcType=DECIMAL},
transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCostFirst.java
......@@ -133,6 +133,15 @@ public class DcBaseCostFirst {
private BigDecimal skuWeight;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.transfer_order_id
*
* @mbg.generated
*/
private String transferOrderId;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_cost_first
*
......@@ -158,6 +167,7 @@ public class DcBaseCostFirst {
sb.append(", bailunSku=").append(bailunSku);
sb.append(", quantity=").append(quantity);
sb.append(", skuWeight=").append(skuWeight);
sb.append(", transferOrderId=").append(transferOrderId);
sb.append("]");
return sb.toString();
}
......@@ -193,7 +203,8 @@ public class DcBaseCostFirst {
&& (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
&& (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
&& (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity()))
&& (this.getSkuWeight() == null ? other.getSkuWeight() == null : this.getSkuWeight().equals(other.getSkuWeight()));
&& (this.getSkuWeight() == null ? other.getSkuWeight() == null : this.getSkuWeight().equals(other.getSkuWeight()))
&& (this.getTransferOrderId() == null ? other.getTransferOrderId() == null : this.getTransferOrderId().equals(other.getTransferOrderId()));
}
/**
......@@ -220,6 +231,7 @@ public class DcBaseCostFirst {
result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode());
result = prime * result + ((getSkuWeight() == null) ? 0 : getSkuWeight().hashCode());
result = prime * result + ((getTransferOrderId() == null) ? 0 : getTransferOrderId().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCostFirstExample.java
......@@ -1249,6 +1249,76 @@ public class DcBaseCostFirstExample {
addCriterion("sku_weight not between", value1, value2, "skuWeight");
return (Criteria) this;
}
public Criteria andTransferOrderIdIsNull() {
addCriterion("transfer_order_id is null");
return (Criteria) this;
}
public Criteria andTransferOrderIdIsNotNull() {
addCriterion("transfer_order_id is not null");
return (Criteria) this;
}
public Criteria andTransferOrderIdEqualTo(String value) {
addCriterion("transfer_order_id =", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdNotEqualTo(String value) {
addCriterion("transfer_order_id <>", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdGreaterThan(String value) {
addCriterion("transfer_order_id >", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdGreaterThanOrEqualTo(String value) {
addCriterion("transfer_order_id >=", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdLessThan(String value) {
addCriterion("transfer_order_id <", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdLessThanOrEqualTo(String value) {
addCriterion("transfer_order_id <=", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdLike(String value) {
addCriterion("transfer_order_id like", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdNotLike(String value) {
addCriterion("transfer_order_id not like", value, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdIn(List<String> values) {
addCriterion("transfer_order_id in", values, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdNotIn(List<String> values) {
addCriterion("transfer_order_id not in", values, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdBetween(String value1, String value2) {
addCriterion("transfer_order_id between", value1, value2, "transferOrderId");
return (Criteria) this;
}
public Criteria andTransferOrderIdNotBetween(String value1, String value2) {
addCriterion("transfer_order_id not between", value1, value2, "transferOrderId");
return (Criteria) this;
}
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment