Merge remote-tracking branch 'origin/master'

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

@@ -166,7 +166,7 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
                     OqsCardQueryResponse oqsCardQueryResponse = jsonPostRepeat(oqsCardQueryRequest, 1);
                     if (oqsCardQueryResponse.getQtkCardInfo() == null)
                         logger.error("老发行库数据同步异常，缺少cardId为{}的数据", cardInfoOnVehicle.getCardId());
-                    if (!cardInfoOnVehicle.getCardId().equals(vo.getCardId()))
+                    else if (oqsCardQueryResponse.getQtkCardInfo().getCardStatus() == CardStatus.ZC)
                         throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("车辆下已存在卡信息");
                     else
                         cardInfoRepo.updateCardStatus(oqsCardQueryResponse.getQtkCardInfo().getCardId(), oqsCardQueryResponse.getQtkCardInfo().getCardStatus());
@@ -241,7 +241,7 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             oqsObuQueryRequest.setObuId(vo.getObuId());
             OqsObuQueryResponse oqsObuQueryResponse = jsonPostRepeat(oqsObuQueryRequest, 1);
             if (oqsObuQueryResponse.getQtkObuInfo() != null && oqsObuQueryResponse.getQtkObuInfo().getObuStatus() == ObuStatus.ZC) {
-                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该卡[" + vo.getCardId() + "]已发行");
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该OBU[" + vo.getObuId() + "]已发行");
             } else {
                 QtkObuInfo obu = obuInfoRepo.findByObuId(vo.getObuId());
                 if (obu != null) {