通信费退费

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssRefundApplyInfo.java

@@ -76,7 +76,7 @@ public class AssRefundApplyInfo extends StringPropertyUUIDEntity {
     @Column(name ="EX_TIME")
     private LocalDateTime exTime;
 
-    /** 金额 */
+    /** 收费金额 */
     @Column(name ="TOLL_AMOUNT")
     @NotNull
     private Long tollAmount;

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

@@ -2,7 +2,6 @@ package cn.com.taiji.iaw.dto.ass.etcTransaction;
 
 import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import cn.com.taiji.core.entity.dict.ass.CheckStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -50,27 +49,37 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
     private Integer vehiclePlateColor;
 
     @ApiModelProperty(value = "入口时间")
+    @NotNull(message = "入口时间不能为空")
     private LocalDateTime enTime;
 
     @ApiModelProperty(value = "出口时间")
+    @NotNull(message = "出口时间不能为空")
     private LocalDateTime exTime;
 
     @ApiModelProperty(value = "入口站名")
+    @NotBlank(message = "入口站名不能为空")
     private String enTollStationName;
 
     @ApiModelProperty(value = "出口站名")
+    @NotBlank(message = "出口站名不能为空")
     private String exTollStationName;
 
     @ApiModelProperty(value = "支付类型，1 现金 2 其他第三方账户支付 3 银联卡支付 4 ETC支付 6 支付宝 7 微信 0 ETC支付 -1 未知")
+    @NotNull(message = "支付类型不能为空")
     private Integer unionPayTransFlag;
 
-    @ApiModelProperty(value = "车型，1 一型客车 2 二型客车 3 三型客车 4 四型客车 11 一型货车 12 二型货车 13 三型货车 14 四型货车 15 五型货车 16 六型货车 21 一型专项作业车 22 二型专项作业车 23 三型专项作业车 24 四型专项作业车 25 五型专项作业车 26 六型专项作业车")
+    @ApiModelProperty(value = "车型")
+    @NotNull(message = "车型不能为空")
     private Integer exVehClass;
 
-    @ApiModelProperty(value = "收费金额（分）tollAmount，需将元*100转成单位分")
+    @ApiModelProperty(value = "收费金额（分），需将元*100转成单位分")
     @NotNull(message = "收费金额不能为空")
     private Long tollAmount;
 
+    @ApiModelProperty(value = "申请退费金额，需将元*100转成单位分")
+    @NotNull(message = "申请退费金额不能为空")
+    private Long fee;
+
     @ApiModelProperty(value = "流水业主单位id")
     private Integer ownerId;
 
@@ -92,7 +101,8 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "16进制卡号")
     private String hexCardId;
 
-    @ApiModelProperty(value = "单省/多省标识")
+    @ApiModelProperty(value = "跨省标识，单省/多省")
+    @NotNull(message = "跨省标识不能为空")
     private Integer multiProvince;
 
     @ApiModelProperty(value = "是否存在拆分结果")
@@ -102,9 +112,6 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
     @NotBlank(message = "申请理由不能为空")
     private String refundReason;
 
-    @ApiModelProperty(value = "审核结果;0-待审核，1-审核中，2-退费中，3-审核通过，4-审核不通过")
-    private CheckStatus checkStatus = CheckStatus.NEW;
-
     @ApiModelProperty(value = "开户行支行名称")
     @NotBlank(message = "开户行支行名称不能为空")
     private String bankBranchName;
@@ -125,12 +132,6 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
         if (applyType == 1){
             validator.validFieldNotBlank("passId",passId);
             validator.validFieldNotBlank("ygzListNo",ygzListNo);
-            validator.validFieldNotNull("enTime",enTime);
-            validator.validFieldNotNull("exTime",exTime);
-            validator.validFieldNotBlank("enTollStationName",enTollStationName);
-            validator.validFieldNotBlank("exTollStationName",exTollStationName);
-            validator.validFieldNotNull("unionPayTransFlag",unionPayTransFlag);
-            validator.validFieldNotNull("exVehClass",exVehClass);
             validator.validFieldNotNull("ownerId",ownerId);
             validator.validFieldNotBlank("ownerName",ownerName);
             validator.validFieldNotBlank("roadName",roadName);
@@ -138,7 +139,6 @@ public class AssRefundApplyInfoApplyRequestDTO extends AbstractBizRequestDTO {
             validator.validFieldNotBlank("manageName",manageName);
             validator.validFieldNotNull("manageUnit",manageUnit);
             validator.validFieldNotBlank("hexCardId",hexCardId);
-            validator.validFieldNotNull("multiProvince",multiProvince);
             validator.validFieldNotNull("isFind",isFind);
         }
     }

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

@@ -7,8 +7,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
-
 /**
  * @Auther: humh
  * @Description:

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

@@ -165,13 +165,14 @@ public class AssRefundApplyInfoManagerImpl extends AbstractIawManager implements
                             .anyMatch(applyInfo -> applyInfo.getCheckStatus() != CheckStatus.CENSOR_APPROVE
                                     && applyInfo.getCheckStatus() != CheckStatus.CENSOR_FAILED);
                     if (hasProcessing) {
-                        throw new ManagerException("该通行流水正在审核中，无需再次申请！");
+                        throw new ManagerException("该通行流水未审核完，无需再次申请！");
                     }
                 }
             }
         }
         AssRefundApplyInfo refundApplyInfo = new AssRefundApplyInfo();
         BeanTools.copyProperties(dto, refundApplyInfo);
+        refundApplyInfo.setCheckStatus(CheckStatus.NEW);
         refundApplyInfo.setFee(dto.getTollAmount());
         refundApplyInfo.setCardType("23".equals(dto.getCardId().substring(8,10)) ? CardType.CHARGE_CARD : CardType.STORED_VALUE_CARD);
         if (dto.getApplyType() == 1){