Merge branch 'v21.1_jianzhuang_20240807' into dev

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildLoadRangeCheckResultVO.java

@@ -11,6 +11,8 @@ import lombok.Setter;
 
 import java.util.Objects;
 
+import static com.clx.performance.enums.PerformanceResultEnum.ORDER_CHILD_LOAD_LIMIT_CONFIG_DISABLED;
+
 /**
  * 是否需要监装结果VO
  */
@@ -28,7 +30,10 @@ public class OrderChildLoadRangeCheckResultVO {
     private String msg;
 
     public Result<OrderChildLoadRangeCheckResultVO> toResult() {
-        if (Objects.equals(code, OrderChildEnum.NeedAlertEnum.OK.getCode())) {
+        if (Objects.equals(code, OrderChildEnum.NeedAlertEnum.OK.getCode())
+                //配置禁用也不弹窗
+                || (Objects.equals(code, ORDER_CHILD_LOAD_LIMIT_CONFIG_DISABLED.getCode()))
+        ) {
             return Result.ok();
         } else {
             Result<OrderChildLoadRangeCheckResultVO> result = Result.fail(PerformanceResultEnum.getEnumByCode(code));

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

@@ -3235,7 +3235,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 }
                 //距离
                 Integer distance = route.getDistance();
-                //超出货源地x公里范围了
+                //超出货源地x公里范围了,且通知状态为未通知
                 if (distance >= driverNoticeConfigVO.getNoticeTriggerDistanceMeter()) {
                     if (Objects.equals(child.getEnterExitSendStatus(), OrderChildEnum.EnterExitSendStatus.DRIVE_OUT.getCode())
                             && Objects.equals(child.getExitNoticeStatus(), OrderChildEnum.ExitNoticeStatus.NOT_NOTIFIED.getCode())
@@ -3265,7 +3265,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             latitude = location[1];
             log.info("当前中交兴路获取司机车牌：{},相关位置信息：{}", truckNo, JSONUtil.parse(truckLocationDTO));
         } else {
-            log.info("中交兴路获取失败,通过高德获取,truckNo：{}", JSONUtil.parse(truckNo));
+            log.info("中交兴路获取失败,通过高德获取,truckNo：{}", truckNo);
         }
         return new BigDecimal[]{longitude, latitude};
     }

performance-web/src/test/java/com/clx/performance/service/impl/OrderChildServiceImplTest.java

 package com.clx.performance.service.impl;
 
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderChildLoadRangeCheckParam;
 import com.clx.performance.service.OrderChildOperateLimitConfigService;
@@ -38,6 +40,8 @@ public class OrderChildServiceImplTest {
 
     @Mock
     private OrderGoodsDao orderGoodsDao;
+    @Mock
+    private OrderChildDao orderChildDao;
 
     private OrderChildLoadRangeCheckParam param;
     private OrderChildOperateLimitConfigVO config;
@@ -45,16 +49,20 @@ public class OrderChildServiceImplTest {
     @Before
     public void setUp() {
         param = new OrderChildLoadRangeCheckParam();
-        param.setOrderGoodsNo("1234567890");
-        param.setTruckNo("苏A12345");
         param.setLatitude(new BigDecimal("32.2304"));
         param.setLongitude(new BigDecimal("122.4737"));
 
+        OrderChild orderChild = new OrderChild();
+        orderChild.setOrderGoodsNo("123456789");
+        orderChild.setTruckNo("黑A88888");
+        Mockito.<com.msl.common.base.Optional<OrderChild>>when(orderChildDao.getByChildNo(param.getChildNo())).thenReturn(com.msl.common.base.Optional.of(orderChild));
+
+
         // 预设的返回值，根据具体业务逻辑可能需要调整
         OrderGoods orderGoods = new OrderGoods();
         orderGoods.setSendLatitude(BigDecimal.valueOf(31.2304));
         orderGoods.setSendLongitude(BigDecimal.valueOf(121.4737));
-        Mockito.<com.msl.common.base.Optional<OrderGoods>>when(orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo())).thenReturn(com.msl.common.base.Optional.of(orderGoods));
+        Mockito.<com.msl.common.base.Optional<OrderGoods>>when(orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo())).thenReturn(com.msl.common.base.Optional.of(orderGoods));
 
         // Mock配置
         config = new OrderChildOperateLimitConfigVO();