调整

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

@@ -113,7 +113,9 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("卡已使用或已报损");
             }
             InvwWarehouse cardWarehouse = warehouseRepo.findByCode(cardDetail.getStoreCode());
-            if (cardWarehouse == null || EnableStatus.ENABLE != cardWarehouse.getStatus()) {
+            if (cardWarehouse == null){
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("卡仓库不存在！");
+            } else if (EnableStatus.ENABLE != cardWarehouse.getStatus()) {
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(cardWarehouse.getName() + "仓库已禁用：" + cardDetail.getStoreCode());
             } else if (cardWarehouse.getIsCheck() != null && cardWarehouse.getIsCheck() == 1
                     && !cardWarehouse.getAgencyId().equals(orderInfo.getAgencyId())) {
@@ -130,7 +132,9 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("OBU已使用或已报损");
         }
         InvwWarehouse obuWarehouse = warehouseRepo.findByCode(obuDetail.getStoreCode());
-        if (obuWarehouse == null || EnableStatus.ENABLE != obuWarehouse.getStatus()) {
+        if (obuWarehouse == null){
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("仓库不存在！");
+        }else if ( EnableStatus.ENABLE != obuWarehouse.getStatus()) {
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(obuWarehouse.getName() + "仓库已禁用：" + obuDetail.getStoreCode());
         } else if (obuWarehouse.getIsCheck() != null && obuWarehouse.getIsCheck() == 1
                 && !obuWarehouse.getAgencyId().equals(orderInfo.getAgencyId())) {