卡签续期调整

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

@@ -73,6 +73,8 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
 
         //卡签校验
         cardAndObuValid(dto.getRenewalType() ,cardInfo, obuInfo);
+        //有效期校验
+        cardAndObuExpireTimeValid(cardInfo, obuInfo);
 
         RenewalInstApplyRequest request = new RenewalInstApplyRequest();
         if (cardInfo != null){
@@ -87,7 +89,7 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
         } catch (ManagerException e) {
             logger.error("获取申请卡签续期指令异常信息："+e.getMessage());
             e.printStackTrace();
-            throw new ManagerException("获取申请卡签续期指令异常"+e.getMessage());
+            throw new ManagerException("获取申请卡签续期指令异常："+e.getMessage());
         }
         if (response == null) {
             throw new ManagerException("未获取申请卡签续期指令");
@@ -181,7 +183,9 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
         }else {
             throw new ManagerException("续期类型错误");
         }
+    }
 
+    private void cardAndObuExpireTimeValid(QtkCardInfo cardInfo, QtkObuInfo obuInfo) throws ManagerException {
         //判断有效期时间
         if (cardInfo != null){
             if (cardInfo.getCardExpireTime().isAfter(LocalDateTime.now().plusYears(1))) {
@@ -201,7 +205,6 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
                 throw new ManagerException("该卡状态为：" + obuInfo.getObuStatus().getValue() + "，不能进行续期操作！");
             }
         }
-
     }