修改

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/DeviceCancelApplyRequest.java

@@ -26,7 +26,7 @@ public class DeviceCancelApplyRequest extends AbstractSignTypeRequest<CommDevice
 
     // 办理人证件类型
     @NotNull(message = "办理人证件类型不能为空")
-    private IdType agentIdType;
+    private String agentIdType;
 
     //办理人证件号码
     @NotBlank(message = "办理人证件号码不能为空")

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/device/DeviceCancelApplyRequestDTO.java

@@ -26,9 +26,9 @@ public class DeviceCancelApplyRequestDTO extends AbstractBizRequestDTO {
     private String agentName;
 
     // 办理人证件类型
-    @NotNull(message = "办理人证件类型不能为空")
+    @NotBlank(message = "办理人证件类型不能为空")
     @ApiModelProperty(value = "办理人证件类型", required = true)
-    private IdType agentIdType;
+    private String agentIdType;
 
     //办理人证件号码
     @NotBlank(message = "办理人证件号码不能为空")

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderCancelManager.java

@@ -100,6 +100,9 @@ public class AssOrderCancelManager extends AbstractAssManager<AssOrderCancelRequ
                 break;
             case DEVICE_RESUME://车辆解挂
                 break;
+            case CANCEL://注销
+                // todo
+                break;
             //TODO
 
             default:

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/DeviceCancelApplyManager.java

@@ -20,12 +20,12 @@ import cn.com.taiji.core.manager.comm.LogManager;
 import cn.com.taiji.core.manager.tools.issue.QdCallUtil;
 import cn.com.taiji.core.model.comm.protocol.ats.model.DeviceCancelChannelNoticeModel;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeResponse;
+import cn.com.taiji.core.model.comm.protocol.bls.CardQueryRequest;
+import cn.com.taiji.core.model.comm.protocol.bls.CardQueryResponse;
+import cn.com.taiji.core.model.comm.protocol.bls.ObuQueryRequest;
+import cn.com.taiji.core.model.comm.protocol.bls.ObuQueryResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.CommDeviceCancelApplyResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.DeviceCancelApplyRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsCardBlackRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsCardBlackResponse;
-import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsObuBlackRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsObuBlackResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
 import cn.com.taiji.ias.model.MyFinals;
@@ -136,17 +136,19 @@ public class DeviceCancelApplyManager extends CommDeviceCancelManager implements
     // 校验
     public void validate(DeviceCancelApplyRequest request) throws ServiceHandleException {
         // 卡黑名单
-        OqsCardBlackRequest cardBlackRequest = new OqsCardBlackRequest();
+        CardQueryRequest cardBlackRequest = new CardQueryRequest();
         cardBlackRequest.setCardId(request.getCardId());
-        OqsCardBlackResponse cardBlackResponse = jsonPostRepeat(cardBlackRequest);
-        if (cardBlackResponse.getQtkBlackCards() != null && cardBlackResponse.getQtkBlackCards().size() > 0) {
+        cardBlackRequest.setStatus(1);
+        CardQueryResponse cardQueryResponse = jsonPostRepeat(cardBlackRequest);
+        if (cardQueryResponse.getResults() != null && cardQueryResponse.getResults().size() > 0) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("卡存在黑名单");
         }
 
-        OqsObuBlackRequest obuBlackRequest = new OqsObuBlackRequest();
+        ObuQueryRequest obuBlackRequest = new ObuQueryRequest();
         obuBlackRequest.setObuId(request.getObuId());
-        OqsObuBlackResponse obuBlackResponse = jsonPostRepeat(obuBlackRequest);
-        if (obuBlackResponse.getQtkBlackObus() != null && obuBlackResponse.getQtkBlackObus().size() > 0) {
+        obuBlackRequest.setStatus(1);
+        ObuQueryResponse obuQueryResponse = jsonPostRepeat(obuBlackRequest);
+        if (obuQueryResponse.getResults() != null && obuQueryResponse.getResults().size() > 0) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("签存在黑名单");
         }
     }
@@ -170,6 +172,7 @@ public class DeviceCancelApplyManager extends CommDeviceCancelManager implements
 
         AssDeviceCancel cancel = new AssDeviceCancel();
         copyProperties(request, cancel);
+        cancel.setAgentIdType(IdType.findByCode(Integer.valueOf(request.getAgentIdType())));
         cancel.setOrderNo(orderInfo.getOrderNo());
         cancel.setCancelType(1);
         cancel.setHasDevice(false);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/DeviceCancelQueryManager.java

@@ -43,7 +43,7 @@ public class DeviceCancelQueryManager extends CommDeviceCancelManager implements
         queryCustomerInfo(vehicle.getCustomerId());
         QtkCardInfo card = queryCardInfo(request.getCardId());
         QtkObuInfo obu = queryObuInfo(request.getObuId());
-        if(!(vehicle.getVehicleId().equals(card.getVehicleId()) && card.getVehicleId().equals(obu.getObuId()))){
+        if (!vehicle.getVehicleId().equals(card.getVehicleId()) || !card.getVehicleId().equals(obu.getVehicleId())) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("车卡签信息校验失败");
         }