ods调整

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/AssRefundApplyInfoApplyRequestDTO.java

@@ -64,11 +64,11 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
     @NotBlank(message = "出口站名不能为空")
     private String exTollStationName;
 
-    @ApiModelProperty(value = "支付类型，1 现金 2 其他第三方账户支付 3 银联卡支付 4 ETC支付 6 支付宝 7 微信 0 ETC支付 -1 未知")
+    @ApiModelProperty(value = "支付类型，有枚举")
     @NotNull(message = "支付类型不能为空")
     private Integer unionPayTransFlag;
 
-    @ApiModelProperty(value = "车型")
+    @ApiModelProperty(value = "车型，有枚举")
     @NotNull(message = "车型不能为空")
     private Integer exVehClass;
 
@@ -101,7 +101,7 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "16进制卡号")
     private String hexCardId;
 
-    @ApiModelProperty(value = "跨省标识，单省/多省")
+    @ApiModelProperty(value = "跨省标识，单省/跨省，0-单省，1-跨省")
     @NotNull(message = "跨省标识不能为空")
     private Integer multiProvince;
 

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

@@ -148,7 +148,8 @@ public class AssRefundApplyInfoManagerImpl extends AbstractIawManager implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AssRefundApplyInfoApplyResponseDTO apply(AssRefundApplyInfoApplyRequestDTO dto) throws ManagerException {
-        if (!StringUtils.isEmpty(dto.getCustomerId())){
+        dto.validate();
+        if (StringUtils.isEmpty(dto.getCustomerId())){
             throw new ManagerException("用户编号没有上传！");
         }
         if (dto.getApplyType() == 1){

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/oqs/issue/CardQueryManagerImpl.java

@@ -13,13 +13,11 @@ import cn.com.taiji.ods.repo.jpa.dsi.DsiCardInfoRepo;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -47,6 +45,19 @@ public class CardQueryManagerImpl  extends AbstractManager implements CardQueryM
     private OqsCardQueryResponse listByVehicleIdInUse(OqsCardQueryRequest req) {
         List<DsiCardInfo> dsiCardInfos = dsiCardInfoRepo.listByVehicleIdInUse(req.getVehicleId());
         List<QtkCardInfo> qtkCardInfos = qtkCardInfoRepo.listByVehicleIdInUse(req.getVehicleId(), new CardStatus[]{CardStatus.ZC,CardStatus.KGS});
+        if (CollectionUtils.isEmpty(dsiCardInfos) && !CollectionUtils.isEmpty(qtkCardInfos)){
+            return resHandle(dsiCardInfos, qtkCardInfos);
+        }
+        return getResponse(dsiCardInfos, qtkCardInfos);
+    }
+
+    private OqsCardQueryResponse resHandle(List<DsiCardInfo> dsiCardInfos, List<QtkCardInfo> qtkCardInfos) {
+        for (QtkCardInfo qtkCardInfo : qtkCardInfos) {
+            DsiCardInfo dsiCardInfo = dsiCardInfoRepo.findByCardId(qtkCardInfo.getCardId());
+            if (dsiCardInfo != null && (dsiCardInfo.getStatus() != 1 || dsiCardInfo.getStatus() != 6)) {
+                return new OqsCardQueryResponse();
+            }
+        }
         return getResponse(dsiCardInfos, qtkCardInfos);
     }
 

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/repo/jpa/dsi/DsiCardInfoRepo.java

@@ -20,4 +20,6 @@ public interface DsiCardInfoRepo extends AbstractJpaRepo<DsiCardInfo, String> {
     @Query("from DsiCardInfo where cardId in ?1 ")
     public List<DsiCardInfo> findByCardIds(List<String> cardId);
 
+
+
 }