Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

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

@@ -88,7 +88,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     List<Double> getLossNet(@Param("param") OrderChildReportParam param);
 
     @Select("<script>" +
-            "select avg(TIMESTAMPDIFF(SECOND,load_time,arrive_send_time)) from " + TABLE +
+            "select avg(TIMESTAMPDIFF(SECOND,arrive_send_time,load_time)) from " + TABLE +
             " where load_time is not null and pay_time &gt;= #{beginTime} " +
             " <if test = 'sendSystemAddressId != null'>and send_system_address_id = #{sendSystemAddressId} </if> " +
             " <if test = 'receiveSystemAddressId != null'>and receive_system_address_id = #{receiveSystemAddressId} </if> " +
@@ -102,7 +102,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
                         String beginTime);
 
     @Select("<script>" +
-            "select avg(TIMESTAMPDIFF(SECOND,unload_time,arrive_receive_time)) from " + TABLE +
+            "select avg(TIMESTAMPDIFF(SECOND,arrive_receive_time,unload_time)) from " + TABLE +
             " where unload_time is not null and pay_time &gt;= #{beginTime} " +
             " <if test = 'sendSystemAddressId != null'>and send_system_address_id = #{sendSystemAddressId} </if> " +
             " <if test = 'receiveSystemAddressId != null'>and receive_system_address_id = #{receiveSystemAddressId} </if> " +

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

@@ -77,9 +77,12 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
         // 计算预计时间
-        BigDecimal[] currentPosition = vehicleWarnCommonService.getCurrentPosition(orderChild.getTruckNo(), orderChild.getDriverUserNo());
-        int arriveSendExpectTime = vehicleWarnCommonService.getNeedTime(currentPosition, orderGoods.getSendLongitude(), orderGoods.getSendLatitude());
-        int arriveReceiveExpectTime = vehicleWarnCommonService.getNeedTime(currentPosition, orderGoods.getReceiveLongitude(), orderGoods.getReceiveLatitude());
+        BigDecimal[] currentPosition = vehicleWarnCommonService.getCurrentPosition(orderChild.getTruckNo(),
+                orderChild.getDriverUserNo());
+        int arriveSendExpectTime = vehicleWarnCommonService.getNeedTime(currentPosition,
+                orderGoods.getSendLongitude(), orderGoods.getSendLatitude());
+        int arriveReceiveExpectTime = vehicleWarnCommonService.getNeedTime(new BigDecimal[]{orderGoods.getSendLongitude(),
+                orderGoods.getSendLatitude()}, orderGoods.getReceiveLongitude(), orderGoods.getReceiveLatitude());
 
         VehicleWarnChild vehicleWarnChild = new VehicleWarnChild();
         vehicleWarnChild.setOrderGoodsNo(orderChild.getOrderGoodsNo());