update

application.pid

@@ -1,2 +1 @@
-27692
-
+23700

build.gradle

@@ -170,6 +170,6 @@ sourceSets {
     }
 }
 
-test {
-    enabled = false
-}
+//test {
+//    enabled = false
+//}

src/main/java/com/qtzl/alterSales/dao/entity/second/AflOrderInfo.java

@@ -5,6 +5,7 @@ import cn.com.taiji.common.entity.StringUUIDEntity;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.time.LocalDateTime;
 
 /***
  * <p>
@@ -66,7 +67,7 @@ public class AflOrderInfo extends StringUUIDEntity {
     private String vehiclePlate;
     private String errMsg;
     private String outTradeNo;
-    private String createTime;
+    private LocalDateTime createTime;
 
     @Column(name = "ACCOUNT_ID")
     public String getAccountId() {
@@ -314,7 +315,7 @@ public class AflOrderInfo extends StringUUIDEntity {
     }
 
     @Column(name = "CREATE_TIME")
-    public String getCreateTime() {
+    public LocalDateTime getCreateTime() {
         return createTime;
     }
 
@@ -514,7 +515,7 @@ public class AflOrderInfo extends StringUUIDEntity {
         this.outTradeNo = outTradeNo;
     }
 
-    public void setCreateTime(String createTime) {
+    public void setCreateTime(LocalDateTime createTime) {
         this.createTime = createTime;
     }
 }

src/main/java/com/qtzl/alterSales/manager/service/AflCenterBlackInfoServiceImpl.java

@@ -43,7 +43,7 @@ public class AflCenterBlackInfoServiceImpl implements AflCenterBlackInfoService
             }
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
-        }), Sort.by(Sort.Direction.DESC, "createTime"));
+        }), Sort.by(Sort.Direction.DESC, "insertTime"));
         if (CollectionUtils.isEmpty(blackInfos)) {
             // 不存在状态名单记录，视为白名单。
             return new AflCenterBlackInfoImplVo(obuId, cardId, false);

src/main/java/com/qtzl/alterSales/manager/service/OrderUserInfoServiceImpl.java

@@ -44,7 +44,6 @@ public class OrderUserInfoServiceImpl implements OrderUserInfoService {
         return orderUserInfoVos;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public String ModOrderUserInfo(ModOrderUserInfoRequest request) throws ServiceHandleException {
         if (StrUtil.isBlank(request.getApplyOrderId()) || StrUtil.isBlank(request.getVehiclePlate())
@@ -55,7 +54,7 @@ public class OrderUserInfoServiceImpl implements OrderUserInfoService {
         }
         EtcOrderUserInfo orderUserInfo = orderUserInfoRepo.findByApplyOrderId(request.getApplyOrderId());
         if (orderUserInfo != null) {
-            extracted(request, orderUserInfo);
+            // extracted(request, orderUserInfo);
             AflOrderUserInfoModLog aflOrderUserInfoModLog = new AflOrderUserInfoModLog();
             aflOrderUserInfoModLog.setApplyOrderId(orderUserInfo.getApplyOrderId());
             aflOrderUserInfoModLog.setUserName(orderUserInfo.getUserName());

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   # Redis数据源
 #  redis:
 #    # Redis数据库索引（默认为0）

src/test/java/SaleTest.java

@@ -363,17 +363,7 @@ public class SaleTest {
 
     @Test
     public void test222() throws ServiceHandleException {
-        String jsonString = "[{\"cpuId\":\"0052232700251883\",\"message\":\"成功\",\"obuId\":\"9901002700059402\"," +
-                "\"vehicleId\":\"9ebd99927b814525941cd62ac050aa1e\",\"returntime\":\"2025-01-17T16:33:54\"," +
-                "\"status\":1},{\"cpuId\":\"0052232700492341\",\"message\":\"成功\",\"obuId\":\"9901000700209586\"," +
-                "\"vehicleId\":\"680c242af22e45b99be20d6d95d44264\",\"returntime\":\"2025-01-17T16:33:57\"," +
-                "\"status\":1},{\"cpuId\":\"0052232700235783\",\"message\":\"成功\",\"obuId\":\"9901002700043302\"," +
-                "\"vehicleId\":\"d4df593c8b964c1c9de33304fc01af5c\",\"returntime\":\"2025-01-17T16:33:57\"," +
-                "\"status\":1},{\"cpuId\":\"0052232400326190\",\"message\":\"成功\",\"obuId\":\"9901000200458212\"," +
-                "\"vehicleId\":\"418ec116f9234d51ad0bc7894257c7fa\",\"returntime\":\"2025-01-17T16:34:02\"," +
-                "\"status\":1},{\"cpuId\":\"0052232700454444\",\"message\":\"成功\",\"obuId\":\"9901002700156968\"," +
-                "\"vehicleId\":\"a6e8d87851bc4435b7adc2c619279789\",\"returntime\":\"2025-01-17T16:34:05\"," +
-                "\"status\":1}]";
+        String jsonString = "[{\"cpuId\":\"1087232700993675\",\"cpuStatus\":1,\"enableTime\":\"2024-12-11\",\"expireTime\":\"2034-12-11\",\"info\":\"成功\",\"issuerService\":\"520101\",\"message\":\"成功\",\"obuId\":\"9901000201918403\",\"obuStatus\":1,\"receiveTime\":\"2025-01-23T11:02:43\",\"returntime\":\"2025-01-23T11:02:38\",\"status\":1,\"vehicleId\":\"c61d80879fee4e5b8a372ac5e063f2b1\"}\",\"{\"cpuId\":\"0052232101224115\",\"cpuStatus\":1,\"enableTime\":\"2024-11-14\",\"expireTime\":\"2034-11-14\",\"info\":\"成功\",\"issuerService\":\"520101\",\"message\":\"成功\",\"obuId\":\"9901000302392915\",\"obuStatus\":1,\"receiveTime\":\"2025-01-23T11:02:45\",\"returntime\":\"2025-01-23T11:02:44\",\"status\":1,\"vehicleId\":\"bb92f341c1314082b33386cc2046287b\"}\",\"{\"cpuId\":\"1087232700377130\",\"cpuStatus\":1,\"enableTime\":\"2024-06-27\",\"expireTime\":\"2034-06-27\",\"info\":\"成功\",\"issuerService\":\"520101\",\"message\":\"成功\",\"obuId\":\"9901000201152094\",\"obuStatus\":1,\"receiveTime\":\"2025-01-23T11:02:46\",\"returntime\":\"2025-01-23T11:02:44\",\"status\":1,\"vehicleId\":\"93240459801c4a82b8b800a54540c997\"}\",\"{\"cpuId\":\"1087232700011231\",\"cpuStatus\":1,\"enableTime\":\"2024-01-05\",\"expireTime\":\"2034-01-05\",\"info\":\"成功\",\"issuerService\":\"520101\",\"message\":\"成功\",\"obuId\":\"9901000200385664\",\"obuStatus\":1,\"receiveTime\":\"2025-01-23T11:02:46\",\"returntime\":\"2025-01-23T11:02:45\",\"status\":1,\"vehicleId\":\"3e3f52c7055b4faa8afe2435219689f1\"}\",\"{\"cpuId\":\"1087232700013333\",\"cpuStatus\":1,\"enableTime\":\"2023-12-26\",\"expireTime\":\"2033-12-26\",\"info\":\"成功\",\"issuerService\":\"520101\",\"message\":\"成功\",\"obuId\":\"9901000200387766\",\"obuStatus\":1,\"receiveTime\":\"2025-01-23T11:02:47\",\"returntime\":\"2025-01-23T11:02:46\",\"status\":1,\"vehicleId\":\"de47fb2817964465a187dc16a99446f2\"}]";
         // 使用fastjson将JSON字符串转换为List<Map<String, Object>>
         String filePath = "C:\\Users\\shui\\Desktop\\1-500 - 副本.txt";
         List<Map<String, Object>> list = JSON.parseObject(jsonString, new TypeReference<List<Map<String, Object>>>
@@ -391,11 +381,11 @@ public class SaleTest {
                     new TypeReference<List<Map<String, Object>>>() {
                     });*/
         VehicleStatusListChangeRequest request = new VehicleStatusListChangeRequest();
-        request.setAgentId("52010188930");
+        request.setAgentId("52010188999");
         request.setReason(4);
         request.setType(1);
         request.setUniqueKey("AFL_YQ_THIRD");
-        request.setOperator("侯燚");
+        request.setOperator("系统");
         // 打印结果
         ArrayList<String> objects = new ArrayList<>();
         for (Map<String, Object> map : list) {