ias

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/SignQueryManager.java

@@ -93,12 +93,14 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
         request.setSubOpenId(req.getSubOpenId());
         AtsVehicleUserStateResponse response = jsonPostRepeat(request);
         //没有签约的要签约，签约过但是不是当前用户，重新签约
-        if (!req.getSubOpenId().equals(response.getOpenId())) {
-            response.setUserState("UNAUTHORIZED");
-            SignQueryResponse signRes = copyProperties(response, new SignQueryResponse());
-            dataStream.put(RES, signRes);
-            return;
-        }
+        //20250716改,openId不可作为校验，因为老九州和新九州appid不同，暂时只要签约过就当作签约了，不管是不是上一任车主签约的
+//        if (!req.getSubOpenId().equals(response.getOpenId())) {
+//            response.setUserState("UNAUTHORIZED");
+//            SignQueryResponse signRes = copyProperties(response, new SignQueryResponse());
+//            dataStream.put(RES, signRes);
+//            return;
+//        }
+
 
         // 签约过
         if (!"UNAUTHORIZED".equals(response.getUserState())) {
@@ -115,6 +117,11 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
                 }
             }
             dataStream.put(RES, new SignQueryResponse().setUserState(response.getUserState()));
+        }else {
+            //  20250716改
+            SignQueryResponse signRes = copyProperties(response, new SignQueryResponse());
+            dataStream.put(RES, signRes);
+            return;
         }
         orderInfoRepo.merge(order);
     }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/VehicleUploadManager.java

@@ -75,7 +75,7 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         // 校验订单
         IssueOrderinfo order = checkOrder(request.getOrderNo());
         // 验证渠道
-        if (!order.getAgencyId().equals(request.getOrgCode())) {
+        if (SourceType.CHANNEL.equals(order.getOrderSource()) && !order.getAgencyId().equals(request.getOrgCode())) {
             throw newBusinessException("操作失败，非本渠道订单");
         }
         // 限制可修改的阶段