commit

performance-web/src/main/java/com/clx/performance/component/GoodsOrderTruckRecordComponent.java

@@ -109,6 +109,7 @@ public class GoodsOrderTruckRecordComponent {
         }
         //释放车辆bind
         if(CollectionUtils.isNotEmpty(ids)){
+            log.info("定向单进行车辆释放,货单编号:{},释放的绑定车辆的id集合:{}",orderGoodsNo,ids);
             orderGoodsTruckBindDao.updateTruckBindExpire(ids);
         }
 

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

@@ -2,11 +2,13 @@ package com.clx.performance.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.clx.order.enums.UpdateEnum;
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dto.dts.DataTransportDTO;
 import com.clx.performance.enums.DtsOperationTypeEnum;
+import com.clx.performance.enums.OrderGoodsPendingOrderWayStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.msl.common.utils.DtsMapConvertUtil;
 import lombok.AllArgsConstructor;
@@ -24,9 +26,11 @@ import java.util.Objects;
 public class OrderGoodsDtsListener {
 
     private final OrderCancelComponent orderCancelComponent;
+    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
     private final OrderGoodsDao orderGoodsDao;
 
 
+
     @RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_GOODS_QUEUE)
     public void onMessage(Message message) {
         try {
@@ -62,13 +66,13 @@ public class OrderGoodsDtsListener {
             orderGoods.setId(after.getId());
             orderGoods.setResidueTransportWeight(BigDecimal.ZERO);
             orderGoodsDao.updateEntityByKey(orderGoods);
-            //定向单解绑定向车辆
+            //释放定向单对应的定向车辆
+            if(Objects.equals(after.getPendingOrderWay(), OrderGoodsPendingOrderWayStatusEnum.Status.EXCLUSIVE.getCode())){
+                goodsOrderTruckRecordComponent.releaseOrderGoodsDriverAndTruck(after.getOrderGoodsNo());
+            }
             log.info("结束自动恢复吨数到订单,订单号:{},货单号:{},货单剩余吨数:{}",
                     after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
         }
 
     }
-
-
-
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -7,7 +7,6 @@ import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
-import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
@@ -55,7 +54,6 @@ import com.msl.common.utils.LocalDateTimeUtils;
 import com.msl.common.utils.gps.GpsUtil;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -1553,10 +1551,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 拉运吨数检测
      */
     private boolean loadCheck(BigDecimal weight, BigDecimal truckLoad) {
-        if (weight.compareTo(new BigDecimal("99")) > 0) {
-            return false;
-        }
-        return true;
+        return weight.compareTo(new BigDecimal("99")) <= 0;
     }
 
     /**