卡签下黑协议接口调整

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardInManager.java

@@ -55,6 +55,13 @@ public class BlackCardInManager extends AbstractCommManager implements LogManage
             if (StringUtils.isEmpty(request.getOrgCode())) {
                 throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("请求参数orgCode必填！");
             }
+            QtkCardInfo cardInfo = cardInfoRepo.findByCardId(request.getCardId());
+            if (cardInfo == null) {
+                throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("未查询到该卡号信息！");
+            }
+            if (cardInfo.getCardStatus() != CardStatus.ZC){
+                throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("正常状态的卡号才能进行下黑！");
+            }
             QtkBlackCard blackCard = null;
             //发送,调部中心接口
             YgzCardBlackUploadResponse uploadResponse = cardBlackUpload(request.getCardId(), 1, request.getType());

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardOutManager.java

@@ -2,6 +2,7 @@ package cn.com.taiji.bls.manager.blk;
 
 import cn.com.taiji.bls.manager.AbstractCommManager;
 import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.CollectionTools;
 import cn.com.taiji.core.entity.basic.QtkBlackCard;
@@ -49,11 +50,15 @@ public class BlackCardOutManager extends AbstractCommManager implements LogManag
     public AbstractBlsResponse serviceHandle(CardOutRequest req) throws ServiceHandleException {
         try {
             long begin = System.currentTimeMillis();
-            LocalDateTime outDate = LocalDateTime.now();
+            QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
+            if (cardInfo == null) {
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该卡号信息！");
+            }
             List<QtkBlackCard> blackCardList = blackCardRepo.queryByCardIdAndType(req.getCardId(), CardBlackType.fromCode(req.getType()));
             if (CollectionTools.isEmpty(blackCardList)){
                 throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型卡号黑名单！");
             }
+            LocalDateTime outDate = LocalDateTime.now();
             QtkBlackCardHis blackCardHis = null;
             //发送,调部中心接口
             YgzCardBlackUploadResponse uploadResponse = blackCardInManager.cardBlackUpload(req.getCardId(), 2, req.getType());

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java

@@ -53,6 +53,13 @@ public class BlackObuInManager extends AbstractCommManager implements LogManager
             if (StringUtils.isEmpty(req.getOrgCode())) {
                 throw GlyServiceError.NO_DATA_ERR.toHandleException("请求参数orgCode必填！");
             }
+            QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
+            if (obuInfo == null) {
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该签号信息！");
+            }
+            if (obuInfo.getObuStatus() != ObuStatus.ZC){
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("正常状态的签号才能进行下黑！");
+            }
             QtkBlackObu blackObu = null;
             //发送,调部中心接口
             YgzObuBlackUploadResponse uploadResponse = obuBlackUpload(req.getObuId(), 1, req.getType());

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuOutManager.java

@@ -2,6 +2,7 @@ package cn.com.taiji.bls.manager.blk;
 
 import cn.com.taiji.bls.manager.AbstractCommManager;
 import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
+import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.CollectionTools;
 import cn.com.taiji.core.entity.basic.QtkBlackObu;
@@ -51,6 +52,10 @@ public class BlackObuOutManager extends AbstractCommManager implements LogManage
         try {
             long begin = System.currentTimeMillis();
             LocalDateTime outDate = LocalDateTime.now();
+            QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
+            if (obuInfo == null) {
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该签号信息！");
+            }
             List<QtkBlackObu> blackObuList = blackObuRepo.queryByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
             if (CollectionTools.isEmpty(blackObuList)){
                 throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型签号黑名单！");