Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test

performance-web/src/main/java/com/clx/performance/job/OrderChildSyncTransportInvoiceExceptionJob.java

@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -62,6 +63,11 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
 
         for (OrderChildSyncTransportInvoiceRecord record : recordList) {
             log.info("orderChildSyncTransportInvoiceExceptionJob执行：{}", JSONUtil.parse(record));
+            if (record.getCreateTime().plusMinutes(10).isBefore(LocalDateTime.now())) {
+                log.info("当前记录运单号:{},生成不足10分钟,先不执行", record.getChildNo());
+                continue;
+            }
+
             String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData();
             String decrypt = ThirdComponent.decrypt(data);
             Result result = JSONUtil.toBean(decrypt, Result.class);

performance-web/src/main/java/com/clx/performance/utils/zjxl/ZjxlGpsService.java

 package com.clx.performance.utils.zjxl;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.clx.performance.constant.GPSConstants;
 import com.clx.performance.dto.zjxl.*;
@@ -95,7 +96,7 @@ public class ZjxlGpsService {
         if (lastLocation == null){return null;}
         TruckLocationDTO location = new TruckLocationDTO(lastLocation.getDrc(), lastLocation.getSpd(), lastLocation.getLon(), lastLocation.getLat(), lastLocation.getUtc(),
                 lastLocation.getProvince(), lastLocation.getCity(), lastLocation.getCountry(), lastLocation.getAdr());
-        log.info("获取车辆位置成功, truckNo:{}", truckNo);
+        log.info("获取车辆位置成功, truckNo:{}, location:{}", truckNo, JSONUtil.parse(location));
 
         return location;
     }