计算物流头程费从物流单维度改为物流-调拨单维度

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

@@ -70,6 +70,15 @@ public class DcMidCostFirstOrder {
     private Integer quantity;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_mid_cost_first_order.transfer_order_id
+     *
+     * @mbg.generated
+     */
+    private String transferOrderId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_mid_cost_first_order
      *
@@ -88,6 +97,7 @@ public class DcMidCostFirstOrder {
         sb.append(", channelOrderId=").append(channelOrderId);
         sb.append(", weightRatio=").append(weightRatio);
         sb.append(", quantity=").append(quantity);
+        sb.append(", transferOrderId=").append(transferOrderId);
         sb.append("]");
         return sb.toString();
     }
@@ -116,7 +126,8 @@ public class DcMidCostFirstOrder {
             && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
             && (this.getChannelOrderId() == null ? other.getChannelOrderId() == null : this.getChannelOrderId().equals(other.getChannelOrderId()))
             && (this.getWeightRatio() == null ? other.getWeightRatio() == null : this.getWeightRatio().equals(other.getWeightRatio()))
-            && (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity()));
+            && (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity()))
+            && (this.getTransferOrderId() == null ? other.getTransferOrderId() == null : this.getTransferOrderId().equals(other.getTransferOrderId()));
     }
 
     /**
@@ -136,6 +147,7 @@ public class DcMidCostFirstOrder {
         result = prime * result + ((getChannelOrderId() == null) ? 0 : getChannelOrderId().hashCode());
         result = prime * result + ((getWeightRatio() == null) ? 0 : getWeightRatio().hashCode());
         result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().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/DcMidCostFirstOrderExample.java

@@ -819,6 +819,76 @@ public class DcMidCostFirstOrderExample {
             addCriterion("quantity not between", value1, value2, "quantity");
             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;
+        }
     }
 
     /**

data-mid/mid-calculate-cost-first/src/main/java/com/bailuntec/domain/pojo/CostFirstOrder.java

+package com.bailuntec.domain.pojo;
+
+import lombok.Data;
+
+@Data
+public class CostFirstOrder {
+    private String channelOrderId;
+    private String transferOrderId;
+}

data-mid/mid-calculate-cost-first/src/main/java/com/bailuntec/job/CalculateCostFirstJob.java

@@ -6,6 +6,7 @@ import com.bailuntec.domain.example.DcBaseCostFirstExample;
 import com.bailuntec.domain.example.DcBaseSkuExample;
 import com.bailuntec.domain.example.DcMidCostFirstExample;
 import com.bailuntec.domain.example.DcMidCostFirstOrderExample;
+import com.bailuntec.domain.pojo.CostFirstOrder;
 import com.bailuntec.mapper.*;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.SessionUtil;
@@ -35,12 +36,12 @@ public class CalculateCostFirstJob extends PointJob {
         do {
             try {
                 DcBaseCostFirstMapper dcBaseCostFirstMapper = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
-                //拿到物流单号, 将物流单中每个SKU的费用算出来
-                List<String> channelOrderIdList = dcBaseCostFirstMapper.listChannelOrderId(jobPointLog.getPageIndex() * jobPointLog.getPageSize(), jobPointLog.getPageSize());
+                //拿到物流单号,调拨单号, 将物流单-调拨单中每个SKU的费用算出来
+                List<CostFirstOrder> channelOrderIdList = dcBaseCostFirstMapper.listChannelOrderId(jobPointLog.getPageIndex() * jobPointLog.getPageSize(), jobPointLog.getPageSize());
                 if (channelOrderIdList != null && channelOrderIdList.size() > 0) {
-                    for (String channelOrderId : channelOrderIdList) {
+                    for (CostFirstOrder costFirstOrder : channelOrderIdList) {
                         DcBaseCostFirstMapper dcBaseCostFirstMapperFor = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
-                        List<DcBaseCostFirst> dcBaseCostFirsts = dcBaseCostFirstMapperFor.selectByExample(DcBaseCostFirstExample.newAndCreateCriteria().andChannelOrderIdEqualTo(channelOrderId).example());
+                        List<DcBaseCostFirst> dcBaseCostFirsts = dcBaseCostFirstMapperFor.selectByExample(DcBaseCostFirstExample.newAndCreateCriteria().andChannelOrderIdEqualTo(costFirstOrder.getChannelOrderId()).andTransferOrderIdEqualTo(costFirstOrder.getTransferOrderId()).example());
                         handleChannelOrderSku(dcBaseCostFirsts);
                     }
                 }
@@ -100,6 +101,7 @@ public class CalculateCostFirstJob extends PointJob {
             dcMidCostFirstOrder.setBailunSku(dcBaseCostFirst.getBailunSku());
             dcMidCostFirstOrder.setWarehouseCode(dcBaseCostFirst.getWarehouseCode());
             dcMidCostFirstOrder.setChannelOrderId(dcBaseCostFirst.getChannelOrderId());
+            dcMidCostFirstOrder.setTransferOrderId(dcBaseCostFirst.getTransferOrderId());
             dcMidCostFirstOrder.setQuantity(dcBaseCostFirst.getQuantity());
             dcMidCostFirstOrder.setWeightRatio(skuWeightRatio);
             //将费用算到单个SKU上

data-mid/mid-calculate-cost-first/src/main/java/com/bailuntec/mapper/DcBaseCostFirstMapper.java

@@ -2,6 +2,7 @@ package com.bailuntec.mapper;
 
 import com.bailuntec.domain.entity.DcBaseCostFirst;
 import com.bailuntec.domain.example.DcBaseCostFirstExample;
+import com.bailuntec.domain.pojo.CostFirstOrder;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -122,7 +123,8 @@ public interface DcBaseCostFirstMapper {
      */
     int upsertSelective(DcBaseCostFirst record);
 
+    List<CostFirstOrder> listChannelOrderId(@Param("v1") Integer v1, @Param("v2") Integer v2);
+
     int countChannelOrder();
 
-    List<String> listChannelOrderId(@Param("v1") Integer v1, @Param("v2") Integer v2);
 }
\ No newline at end of file

data-mid/mid-calculate-cost-first/src/main/java/com/bailuntec/mapper/DcMidCostFirstOrderMapper.java

@@ -5,7 +5,6 @@ import com.bailuntec.domain.example.DcMidCostFirstOrderExample;
 import com.bailuntec.domain.pojo.MidCostFirst;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 public interface DcMidCostFirstOrderMapper {
@@ -124,8 +123,7 @@ public interface DcMidCostFirstOrderMapper {
      */
     int upsertSelective(DcMidCostFirstOrder record);
 
-
     int countSkuWarehouse();
 
-    List<MidCostFirst> listSkuWarehouse(@Param("v1")int v1, @Param("v2")int v2);
+    List<MidCostFirst> listSkuWarehouse(@Param("v1") int v1, @Param("v2") int v2);
 }
\ No newline at end of file

data-mid/mid-calculate-cost-first/src/main/java/com/bailuntec/mapper/DcMidCostFirstOrderMapper.xml

@@ -13,6 +13,7 @@
     <result column="channel_order_id" jdbcType="VARCHAR" property="channelOrderId" />
     <result column="weight_ratio" jdbcType="DECIMAL" property="weightRatio" />
     <result column="quantity" jdbcType="INTEGER" property="quantity" />
+    <result column="transfer_order_id" jdbcType="VARCHAR" property="transferOrderId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +86,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, cost_first, bailun_sku, warehouse_code, channel_order_id, weight_ratio, quantity
+    id, cost_first, bailun_sku, warehouse_code, channel_order_id, weight_ratio, quantity, 
+    transfer_order_id
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcMidCostFirstOrderExample" resultMap="BaseResultMap">
     <!--
@@ -148,10 +150,10 @@
     -->
     insert into dc_mid_cost_first_order (id, cost_first, bailun_sku, 
       warehouse_code, channel_order_id, weight_ratio, 
-      quantity)
+      quantity, transfer_order_id)
     values (#{id,jdbcType=INTEGER}, #{costFirst,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, 
       #{warehouseCode,jdbcType=VARCHAR}, #{channelOrderId,jdbcType=VARCHAR}, #{weightRatio,jdbcType=DECIMAL}, 
-      #{quantity,jdbcType=INTEGER})
+      #{quantity,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcMidCostFirstOrder">
     <!--
@@ -181,6 +183,9 @@
       <if test="quantity != null">
         quantity,
       </if>
+      <if test="transferOrderId != null">
+        transfer_order_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -204,6 +209,9 @@
       <if test="quantity != null">
         #{quantity,jdbcType=INTEGER},
       </if>
+      <if test="transferOrderId != null">
+        #{transferOrderId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcMidCostFirstOrderExample" resultType="java.lang.Long">
@@ -244,6 +252,9 @@
       <if test="record.quantity != null">
         quantity = #{record.quantity,jdbcType=INTEGER},
       </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" />
@@ -261,7 +272,8 @@
       warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
       channel_order_id = #{record.channelOrderId,jdbcType=VARCHAR},
       weight_ratio = #{record.weightRatio,jdbcType=DECIMAL},
-      quantity = #{record.quantity,jdbcType=INTEGER}
+      quantity = #{record.quantity,jdbcType=INTEGER},
+      transfer_order_id = #{record.transferOrderId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -291,6 +303,9 @@
       <if test="quantity != null">
         quantity = #{quantity,jdbcType=INTEGER},
       </if>
+      <if test="transferOrderId != null">
+        transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -305,7 +320,8 @@
       warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
       channel_order_id = #{channelOrderId,jdbcType=VARCHAR},
       weight_ratio = #{weightRatio,jdbcType=DECIMAL},
-      quantity = #{quantity,jdbcType=INTEGER}
+      quantity = #{quantity,jdbcType=INTEGER},
+      transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcMidCostFirstOrder">
@@ -337,6 +353,9 @@
       <if test="quantity != null">
         quantity,
       </if>
+      <if test="transferOrderId != null">
+        transfer_order_id,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -361,6 +380,9 @@
       <if test="quantity != null">
         #{quantity,jdbcType=INTEGER},
       </if>
+      <if test="transferOrderId != null">
+        #{transferOrderId,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -385,6 +407,9 @@
       <if test="quantity != null">
         quantity = #{quantity,jdbcType=INTEGER},
       </if>
+      <if test="transferOrderId != null">
+        transfer_order_id = #{transferOrderId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcMidCostFirstOrder">
@@ -394,12 +419,12 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     insert into dc_mid_cost_first_order
-    (id, cost_first, bailun_sku, warehouse_code, channel_order_id, weight_ratio, quantity
-      )
+    (id, cost_first, bailun_sku, warehouse_code, channel_order_id, weight_ratio, quantity, 
+      transfer_order_id)
     values
     (#{id,jdbcType=INTEGER}, #{costFirst,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, 
       #{warehouseCode,jdbcType=VARCHAR}, #{channelOrderId,jdbcType=VARCHAR}, #{weightRatio,jdbcType=DECIMAL}, 
-      #{quantity,jdbcType=INTEGER})
+      #{quantity,jdbcType=INTEGER}, #{transferOrderId,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     cost_first = #{costFirst,jdbcType=DECIMAL}, 
@@ -407,7 +432,8 @@
     warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, 
     channel_order_id = #{channelOrderId,jdbcType=VARCHAR}, 
     weight_ratio = #{weightRatio,jdbcType=DECIMAL}, 
-    quantity = #{quantity,jdbcType=INTEGER}
+    quantity = #{quantity,jdbcType=INTEGER}, 
+    transfer_order_id = #{transferOrderId,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcMidCostFirstOrderExample" resultMap="BaseResultMap">
     <!--

data-mid/mid-calculate-cost-first/src/main/resources/job.properties

@@ -10,5 +10,5 @@ EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
 JOB_NAME=mid-calculate-cost-first
-JOB_CRON=0 33 7,20 * * ? *
+JOB_CRON=0 33 7,12,20 * * ? *
 SHARDING_TOTAL_COUNT=1
\ No newline at end of file

data-mid/mid-calculate-cost-first/src/test/java/CostFirstTest.java

 import com.bailuntec.domain.entity.DcBaseCostFirst;
 import com.bailuntec.domain.example.DcBaseCostFirstExample;
+import com.bailuntec.domain.pojo.CostFirstOrder;
 import com.bailuntec.job.CalculateCostFirstJob;
 import com.bailuntec.listener.CalculateCostFirstListener;
 import com.bailuntec.mapper.DcBaseCostFirstMapper;
@@ -16,11 +17,11 @@ public class CostFirstTest {
         try {
             DcBaseCostFirstMapper dcBaseCostFirstMapper = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
             //拿到物流单号, 将物流单中每个SKU的费用算出来
-            List<String> channelOrderIdList = dcBaseCostFirstMapper.listChannelOrderId(200, 2);
+            List<CostFirstOrder> channelOrderIdList = dcBaseCostFirstMapper.listChannelOrderId(200, 2);
             if (channelOrderIdList != null && channelOrderIdList.size() > 0) {
-                for (String channelOrderId : channelOrderIdList) {
+                for (CostFirstOrder costFirstOrder : channelOrderIdList) {
                     DcBaseCostFirstMapper dcBaseCostFirstMapperFor = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
-                    List<DcBaseCostFirst> dcBaseCostFirsts = dcBaseCostFirstMapperFor.selectByExample(DcBaseCostFirstExample.newAndCreateCriteria().andChannelOrderIdEqualTo(channelOrderId).example());
+                    List<DcBaseCostFirst> dcBaseCostFirsts = dcBaseCostFirstMapperFor.selectByExample(DcBaseCostFirstExample.newAndCreateCriteria().andChannelOrderIdEqualTo(costFirstOrder.getChannelOrderId()).andTransferOrderIdEqualTo(costFirstOrder.getTransferOrderId()).example());
                     costFirstJob.handleChannelOrderSku(dcBaseCostFirsts);
                 }
             }
@@ -30,7 +31,8 @@ public class CostFirstTest {
         } finally {
             SessionUtil.closeSession();
         }
-
+        CalculateCostFirstListener calculateCostFirstListener = new CalculateCostFirstListener();
+        calculateCostFirstListener.afterJobExecuted(null);
     }
     @Test
     public void  test1() {

mybatis-generator/src/main/resources/init.properties

-table-name=dc_base_oms_sku
+table-name=dc_mid_cost_first_order