OCR修改

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/AbstractIawManager.java

@@ -85,7 +85,7 @@ public abstract class AbstractIawManager extends AbstractCommManager {
             res.setOcrResultId(ocrResult.getId());
             res.setImageUrl(new MinioUtil().getOuterUrl(res.getImageUrl()));
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);
@@ -105,7 +105,7 @@ public abstract class AbstractIawManager extends AbstractCommManager {
             res.setOcrResultId(ocrResult.getId());
             res.setImageUrl(new MinioUtil().getOuterUrl(res.getImageUrl()));
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);
@@ -124,7 +124,7 @@ public abstract class AbstractIawManager extends AbstractCommManager {
             res.setOcrResultId(ocrResult.getId());
             res.setImageUrl(new MinioUtil().getOuterUrl(res.getImageUrl()));
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/AbstractUserwManager.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.userw.manager;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.core.entity.comm.OcrResult;
 import cn.com.taiji.core.entity.dict.OcrType;
@@ -66,7 +65,7 @@ public abstract class AbstractUserwManager extends AbstractCommManager {
             ocrResultRepo.save(ocrResult);
             res.setOcrResultId(ocrResult.getId());
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);
@@ -85,7 +84,7 @@ public abstract class AbstractUserwManager extends AbstractCommManager {
             ocrResultRepo.save(ocrResult);
             res.setOcrResultId(ocrResult.getId());
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);
@@ -103,7 +102,7 @@ public abstract class AbstractUserwManager extends AbstractCommManager {
             ocrResultRepo.save(ocrResult);
             res.setOcrResultId(ocrResult.getId());
             return res;
-        } catch (ServiceHandleException e) {
+        } catch (ManagerException e) {
             ocrResult.setCode(e.getErrorCode());
             ocrResult.setMessage(e.getMessage());
             ocrResultRepo.save(ocrResult);

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

@@ -82,7 +82,8 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         if (!IssueOrderStatus.NORMAL.equals(order.getOrderStatus())) {
             throw newBusinessException("订单状态异常，订单状态" + order.getOrderStatus().getStatus());
         }
-        if (!IssueOrderStep.CUSTOMER_UPLOAD.equals(order.getOrderStep()) && !IssueOrderStep.VEHICLE_UPLOAD.equals(order.getOrderStep())) {
+        if (!IssueOrderStep.CUSTOMER_UPLOAD.equals(order.getOrderStep()) && !IssueOrderStep.VEHICLE_UPLOAD.equals(order.getOrderStep())
+                && !IssueOrderStep.WAITING_AUDIT.equals(order.getOrderStep())) {
             throw newBusinessException("当前订单阶段不能上传车辆信息");
         }
         if (!Objects.equals(order.getVanType(), request.getVanType())) {