头程费新增operationTime时间

data-base/base-sync-cost-first/src/main/java/com/bailuntec/domain/pojo/CostFirstData.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -37,4 +38,6 @@ public class CostFirstData {
     //总费用
     @JSONField(name = "totalPrices")
     private BigDecimal costFirst;
+    @JSONField(name = "operationTime")
+    private LocalDateTime operationTime;
 }

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCostFirst.java

@@ -3,6 +3,7 @@ package com.bailuntec.domain.entity;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class DcBaseCostFirst {
@@ -142,6 +143,33 @@ public class DcBaseCostFirst {
     private String transferOrderId;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.area_id
+     *
+     * @mbg.generated
+     */
+    private Integer areaId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.company_id
+     *
+     * @mbg.generated
+     */
+    private Integer companyId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_cost_first.operation_time
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime operationTime;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_cost_first
      *
@@ -168,6 +196,9 @@ public class DcBaseCostFirst {
         sb.append(", quantity=").append(quantity);
         sb.append(", skuWeight=").append(skuWeight);
         sb.append(", transferOrderId=").append(transferOrderId);
+        sb.append(", areaId=").append(areaId);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", operationTime=").append(operationTime);
         sb.append("]");
         return sb.toString();
     }
@@ -204,7 +235,10 @@ public class DcBaseCostFirst {
             && (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.getTransferOrderId() == null ? other.getTransferOrderId() == null : this.getTransferOrderId().equals(other.getTransferOrderId()));
+            && (this.getTransferOrderId() == null ? other.getTransferOrderId() == null : this.getTransferOrderId().equals(other.getTransferOrderId()))
+            && (this.getAreaId() == null ? other.getAreaId() == null : this.getAreaId().equals(other.getAreaId()))
+            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
+            && (this.getOperationTime() == null ? other.getOperationTime() == null : this.getOperationTime().equals(other.getOperationTime()));
     }
 
     /**
@@ -232,6 +266,9 @@ public class DcBaseCostFirst {
         result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode());
         result = prime * result + ((getSkuWeight() == null) ? 0 : getSkuWeight().hashCode());
         result = prime * result + ((getTransferOrderId() == null) ? 0 : getTransferOrderId().hashCode());
+        result = prime * result + ((getAreaId() == null) ? 0 : getAreaId().hashCode());
+        result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
+        result = prime * result + ((getOperationTime() == null) ? 0 : getOperationTime().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseCostFirstExample.java

 package com.bailuntec.domain.example;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -1319,6 +1320,186 @@ public class DcBaseCostFirstExample {
             addCriterion("transfer_order_id not between", value1, value2, "transferOrderId");
             return (Criteria) this;
         }
+
+        public Criteria andAreaIdIsNull() {
+            addCriterion("area_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdIsNotNull() {
+            addCriterion("area_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdEqualTo(Integer value) {
+            addCriterion("area_id =", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdNotEqualTo(Integer value) {
+            addCriterion("area_id <>", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdGreaterThan(Integer value) {
+            addCriterion("area_id >", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("area_id >=", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdLessThan(Integer value) {
+            addCriterion("area_id <", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdLessThanOrEqualTo(Integer value) {
+            addCriterion("area_id <=", value, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdIn(List<Integer> values) {
+            addCriterion("area_id in", values, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdNotIn(List<Integer> values) {
+            addCriterion("area_id not in", values, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdBetween(Integer value1, Integer value2) {
+            addCriterion("area_id between", value1, value2, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("area_id not between", value1, value2, "areaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeIsNull() {
+            addCriterion("operation_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeIsNotNull() {
+            addCriterion("operation_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeEqualTo(LocalDateTime value) {
+            addCriterion("operation_time =", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeNotEqualTo(LocalDateTime value) {
+            addCriterion("operation_time <>", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeGreaterThan(LocalDateTime value) {
+            addCriterion("operation_time >", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("operation_time >=", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeLessThan(LocalDateTime value) {
+            addCriterion("operation_time <", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("operation_time <=", value, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeIn(List<LocalDateTime> values) {
+            addCriterion("operation_time in", values, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeNotIn(List<LocalDateTime> values) {
+            addCriterion("operation_time not in", values, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("operation_time between", value1, value2, "operationTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationTimeNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("operation_time not between", value1, value2, "operationTime");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcBaseCostFirstMapper.xml

@@ -21,6 +21,9 @@
     <result column="quantity" jdbcType="INTEGER" property="quantity" />
     <result column="sku_weight" jdbcType="DECIMAL" property="skuWeight" />
     <result column="transfer_order_id" jdbcType="VARCHAR" property="transferOrderId" />
+    <result column="area_id" jdbcType="INTEGER" property="areaId" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <result column="operation_time" jdbcType="TIMESTAMP" property="operationTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -95,7 +98,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, transfer_order_id
+    sku_weight, transfer_order_id, area_id, company_id, operation_time
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
     <!--
@@ -160,13 +163,15 @@
       box_id, cost_first, cost_goods_clearance, 
       cost_duty, cost_customs_clearance, cost_weight, 
       cost_fuel, warehouse_code, bailun_sku, 
-      quantity, sku_weight, transfer_order_id
+      quantity, sku_weight, transfer_order_id, 
+      area_id, company_id, operation_time
       )
     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}, #{transferOrderId,jdbcType=VARCHAR}
+      #{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL}, #{transferOrderId,jdbcType=VARCHAR}, 
+      #{areaId,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{operationTime,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
@@ -221,6 +226,15 @@
       <if test="transferOrderId != null">
         transfer_order_id,
       </if>
+      <if test="areaId != null">
+        area_id,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="operationTime != null">
+        operation_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -268,6 +282,15 @@
       <if test="transferOrderId != null">
         #{transferOrderId,jdbcType=VARCHAR},
       </if>
+      <if test="areaId != null">
+        #{areaId,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="operationTime != null">
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultType="java.lang.Long">
@@ -332,6 +355,15 @@
       <if test="record.transferOrderId != null">
         transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR},
       </if>
+      <if test="record.areaId != null">
+        area_id = #{record.areaId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.operationTime != null">
+        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -357,7 +389,10 @@
       bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
       quantity = #{record.quantity,jdbcType=INTEGER},
       sku_weight = #{record.skuWeight,jdbcType=DECIMAL},
-      transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR}
+      transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR},
+      area_id = #{record.areaId,jdbcType=INTEGER},
+      company_id = #{record.companyId,jdbcType=INTEGER},
+      operation_time = #{record.operationTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -411,6 +446,15 @@
       <if test="transferOrderId != null">
         transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
       </if>
+      <if test="areaId != null">
+        area_id = #{areaId,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="operationTime != null">
+        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -433,7 +477,10 @@
       bailun_sku = #{bailunSku,jdbcType=VARCHAR},
       quantity = #{quantity,jdbcType=INTEGER},
       sku_weight = #{skuWeight,jdbcType=DECIMAL},
-      transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
+      transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
+      area_id = #{areaId,jdbcType=INTEGER},
+      company_id = #{companyId,jdbcType=INTEGER},
+      operation_time = #{operationTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
@@ -489,6 +536,15 @@
       <if test="transferOrderId != null">
         transfer_order_id,
       </if>
+      <if test="areaId != null">
+        area_id,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="operationTime != null">
+        operation_time,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -537,6 +593,15 @@
       <if test="transferOrderId != null">
         #{transferOrderId,jdbcType=VARCHAR},
       </if>
+      <if test="areaId != null">
+        #{areaId,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="operationTime != null">
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -585,6 +650,15 @@
       <if test="transferOrderId != null">
         transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
       </if>
+      <if test="areaId != null">
+        area_id = #{areaId,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="operationTime != null">
+        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
@@ -596,13 +670,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, transfer_order_id)
+      sku_weight, transfer_order_id, area_id, company_id, operation_time)
     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}, #{transferOrderId,jdbcType=VARCHAR}
+      #{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL}, #{transferOrderId,jdbcType=VARCHAR}, 
+      #{areaId,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, #{operationTime,jdbcType=TIMESTAMP}
       )
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
@@ -619,7 +694,10 @@
     bailun_sku = #{bailunSku,jdbcType=VARCHAR}, 
     quantity = #{quantity,jdbcType=INTEGER}, 
     sku_weight = #{skuWeight,jdbcType=DECIMAL}, 
-    transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
+    transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}, 
+    area_id = #{areaId,jdbcType=INTEGER}, 
+    company_id = #{companyId,jdbcType=INTEGER}, 
+    operation_time = #{operationTime,jdbcType=TIMESTAMP}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
     <!--