Merge branch 'v19.6_carrier_optimization_20240717' into test

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -2,14 +2,14 @@ package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
-import com.clx.performance.model.OrderGoodsFleetOpenTruck;
-import com.clx.performance.param.app.AppGoodsOrderSearchParam;
-import com.clx.performance.param.pc.OrderGoodsEditParams;
-import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OrderGoodsFleetOpenTruck;
+import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.param.pc.GoodsOrderMapParam;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
@@ -108,4 +108,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     void batchCancel(List<Integer> idList);
 
     void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight);
+
+    void updateAlreadyLoadWeight(BigDecimal alreadyLoadWeight, String  orderGoodsNo);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -305,4 +305,9 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     public void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight) {
         baseMapper.batchCancelOrderGoods(cancelOrderGoodsWeight);
     }
+
+    @Override
+    public void updateAlreadyLoadWeight(BigDecimal alreadyLoadWeight, String orderGoodsNo) {
+        baseMapper.updateAlreadyLoadWeight(alreadyLoadWeight,orderGoodsNo);
+    }
 }

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -14,6 +14,7 @@ import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildImageDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
 import com.clx.performance.enums.OrderChildEnum;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.math.BigDecimal;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -55,6 +57,8 @@ public class OrderChildDtsListener  {
     private final TruckFeign truckFeign;
     private final OrderChildImageDao orderChildImageDao;
 
+    private final OrderGoodsDao orderGoodsDao;
+
 
 
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
@@ -256,12 +260,14 @@ public class OrderChildDtsListener  {
      * @param after
      */
     private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){
-        //运单取消处理
-        if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
-            //如果运单有装车吨数，货单装车吨数需要扣除
-            if(Objects.nonNull(after.getLoadNet())){
-
-            }
+        BigDecimal loadNet = after.getLoadNet();//装车净重
+        String orderGoodsNo = after.getOrderGoodsNo();//货单号
+        if(Objects.nonNull(loadNet)) {//装车吨数不为空处理
+            if (OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())) {
+                //运单取消,货单装车吨数需要减掉
+                loadNet = loadNet.negate();
+            }
+            orderGoodsDao.updateAlreadyLoadWeight(loadNet, orderGoodsNo);
         }
 
     }

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dto.CancelOrderGoodsWeightDTO;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsFleetOpenTruck;
 import com.clx.performance.param.app.AppGoodsOrderSearchParam;
 import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
-import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
@@ -106,4 +106,9 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "batchCancelOrderGoods")
     void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight);
+
+
+    @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateAlreadyLoadWeight")
+    void updateAlreadyLoadWeight(@Param(value = "alreadyLoadWeight") BigDecimal alreadyLoadWeight,@Param(value = "orderGoodsNo") String orderGoodsNo);
+
 }

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -379,4 +379,16 @@ public class OrderGoodsSqlProvider {
 
     }
 
+
+
+    public String updateAlreadyLoadWeight(@Param(value = "alreadyLoadWeight") BigDecimal alreadyLoadWeight,@Param(value = "orderGoodsNo") String orderGoodsNo){
+        String sql = new SQL() {{
+            UPDATE("order_goods")
+                    .SET("already_load_weight = already_load_weight + #{alreadyLoadWeight}")
+                    .WHERE("order_goods_no = #{orderGoodsNo}");
+
+        }}.toString();
+        return sql;
+    }
+
 }