ias 车辆信息上传审核规则修改，签约规则修改

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/audit/VerificationRuleManager.java

@@ -260,7 +260,7 @@ public class VerificationRuleManager extends AbstractCommManager {
                 builder.append("行驶证主页照片识别结果异常；");
             }
         }
-        OcrResult neg = ocrResultRepo.findByUrlAndType(model.getVehPosImgUrl(), OcrType.vehicle_license_back);
+        OcrResult neg = ocrResultRepo.findByUrlAndType(model.getVehNegImgUrl(), OcrType.vehicle_license_back);
         if (neg == null) {
             builder.append("行驶证副页照片未找到识别结果；");
         } else {

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

@@ -74,7 +74,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
                 carSignV2(request, order, dataStream,ext);
                 break;
             case YELLOW:
-                carSignV3(request, order,dataStream);
+                carSignV3(request, order,dataStream,ext);
                 break;
             default:
                 throw newBusinessException("微信签约只支持，蓝、渐变绿、黄，三种车牌签约");
@@ -109,7 +109,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             if (order.getOrderSource().equals(SourceType.CHANNEL)) { //渠道签约完成待激活
                 order.setOrderStep(IssueOrderStep.WAITING_ACTIVE);
             } else {
-                if (hasText(ext.getAuditReason())) {
+                if (hasText(ext.getAuditReason()) || order.getVanType() !=1) {//非客车不论自动审核是否通过，都待审核
                     order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
                 }else {
                     order.setOrderStep(ShippingStatus.WAIT_SHIPPING.equals(order.getShippingStatus()) ?
@@ -126,7 +126,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
         orderInfoRepo.merge(order);
     }
 
-    private void carSignV3(SignQueryRequest request, IssueOrderinfo order,Map<String, Object> dataStream) throws ServiceHandleException {
+    private void carSignV3(SignQueryRequest request, IssueOrderinfo order,Map<String, Object> dataStream,IssueOrderinfoExt ext) throws ServiceHandleException {
 
 
         CommonWxSignConfig signConfig = commonWxSignConfigRepo.findByAgencyIdAndVersion(order.getAgencyId(), 3);
@@ -153,8 +153,12 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             if (order.getOrderSource().equals(SourceType.CHANNEL)) { //渠道签约完成待激活
                 order.setOrderStep(IssueOrderStep.WAITING_ACTIVE);
             } else {
-                order.setOrderStep(ShippingStatus.WAIT_SHIPPING.equals(order.getShippingStatus()) ?
-                        IssueOrderStep.WAITING_SEND : IssueOrderStep.WAITING_ACTIVE);
+                if (hasText(ext.getAuditReason()) || order.getVanType() !=1) {//非客车不论自动审核是否通过，都待审核
+                    order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
+                }else {
+                    order.setOrderStep(ShippingStatus.WAIT_SHIPPING.equals(order.getShippingStatus()) ?
+                            IssueOrderStep.WAITING_SEND : IssueOrderStep.WAITING_ACTIVE);
+                }
             }
             vehicleInfo.setContractId(resultResponse.getContractId());
             vehicleInfoRepo.merge(vehicleInfo);

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

@@ -340,23 +340,18 @@ public class VehicleUploadManager extends AbstractOrderManager<VehicleUploadRequ
         }
         // 是否被人工审核 1：人工 2：系统 0：未审核。人工审核时再变成1
         order.setArtificialStatus(2);
-        if (order.getVanType() == 1) {
-            if (SourceType.CHANNEL.equals(order.getOrderSource())) {
+        if (SourceType.CHANNEL.equals(order.getOrderSource())) {
+            if (order.getVanType() !=1){ //非客车 都需要审核
+                order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
+            }else {
                 if (!hasText(failReason)) {
                     order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//待支付
-//                    if (order.getNeedPay()) {
-//                    } else {
-//                        // 不需要支付-审核通过直接待签约
-//                        order.setOrderStep(IssueOrderStep.ORDER_PAID);//待签约
-//                    }
                 } else {
                     order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
                 }
-            } else {
-                order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//待支付
             }
         } else {
-            order.setOrderStep(IssueOrderStep.WAITING_AUDIT);
+            order.setOrderStep(IssueOrderStep.VEHICLE_UPLOAD);//待支付
         }
         ext.setAuditReason(failReason);
         orderInfoRepo.save(order);