~

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

@@ -46,6 +46,11 @@ public abstract class AbstractCommManager extends RedisCacheManager {
         return jsonPost(req, r -> jsonPostRepeat(r, 3));
     }
 
+    public <RS extends AbstractSignTypeResponse> RS jsonPost(AbstractSignTypeRequest<RS> req)
+            throws ManagerException {
+        return jsonPost(req, r -> feignClientManager.jsonPost(req, req.getResponseType()));
+    }
+
     /**
      * <pre>
      * 重复提交业务请求

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

@@ -31,7 +31,6 @@ import cn.com.taiji.iaw.manager.AbstractIawManager;
 import cn.com.taiji.iaw.model.MyFinals;
 import cn.com.taiji.iaw.repo.jpa.request.issue.IssueOrderaPageRequest;
 import cn.com.taiji.iaw.repo.jpa.request.issue.IssueOrdermPageRequest;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
@@ -43,7 +42,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -334,12 +336,12 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
 
     @Override
     public InstApplyResponse issueApply(InstApplyRequest reqDto) throws ManagerException, IOException {
-        return jsonPostRepeat(reqDto,1);
+        return jsonPost(reqDto);
     }
 
     @Override
     public InstCallBackResponse issueCallback(InstCallBackRequest reqDto) throws ManagerException, IOException {
-        return jsonPostRepeat(reqDto,1);
+        return jsonPost(reqDto);
     }
 
     @Override

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstApplyManager.java

@@ -200,14 +200,14 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
         // 货车和专项作业车不能发行单片式OBU
         if (orderInfo.getVanType() == 2) {
             if (req.getCardVersion() == 48 || req.getCardVersion() == 52)
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("货车不能发行单片式OBU");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("货车不支持单片式设备激活");
             if (req.getObuVersion() == 48 || req.getObuVersion() == 52)
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("货车不能发行单片式OBU");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("货车不支持单片式设备激活");
         } else if (orderInfo.getVanType() == 3) {
             if (req.getCardVersion() == 48 || req.getCardVersion() == 52)
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("专项作业车不能发行单片式OBU");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("专项作业车不支持单片式设备激活");
             if (req.getObuVersion() == 48 || req.getObuVersion() == 52)
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("专项作业车不能发行单片式OBU");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("专项作业车不支持单片式设备激活");
         }
         if (!orderInfo.getProtocol().equals("1"))
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该订单未签署协议，无法激活");