优化车辆信用期改造

java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -35,6 +35,8 @@ public class OwnerCarDto extends PageDto implements Serializable {
 
     public static final String LEASE_TYPE_TEMP = "T";//临时车
 
+    public static final String CAR_TYPE_CREDIT = "9906"; //信用期车牌
+
     private String carColor;
     private String carBrand;
     private String carType;

service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java

@@ -328,11 +328,12 @@ public class PayBatchFeeCmd extends Cmd {
         Calendar endTimeCalendar = null;
         //车位费用续租
         for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
-            //后付费 加一个月
-            if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeInfo.getPaymentCd())){
+            //后付费 或者信用期车辆 加一个月
+            if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeInfo.getPaymentCd())
+                    || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())) {
                 endTimeCalendar = Calendar.getInstance();
                 endTimeCalendar.setTime(feeEndTime);
-                endTimeCalendar.add(Calendar.MONTH,1);
+                endTimeCalendar.add(Calendar.MONTH, 1);
                 feeEndTime = endTimeCalendar.getTime();
             }
             if (tmpOwnerCarDto.getEndTime().getTime() >= feeEndTime.getTime()) {
@@ -412,11 +413,11 @@ public class PayBatchFeeCmd extends Cmd {
         }
         feeInfo.setEndTime(endCalender.getTime());
         Date maxEndTime = feeInfo.getDeadlineTime();
-        if(FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())){
+        if (FeeDto.FEE_FLAG_CYCLE.equals(feeInfo.getFeeFlag())) {
             maxEndTime = feeInfo.getConfigEndTime();
         }
         //判断 结束时间 是否大于 费用项 结束时间，这里 容错一下，如果 费用结束时间大于 费用项结束时间 30天 走报错 属于多缴费
-        if(maxEndTime != null) {
+        if (maxEndTime != null) {
             if (feeInfo.getEndTime().getTime() - maxEndTime.getTime() > 30 * 24 * 60 * 60 * 1000L) {
                 throw new IllegalArgumentException("缴费超过了 费用项结束时间");
             }

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java

@@ -535,8 +535,9 @@ public class PayFeeCmd extends Cmd {
         Calendar endTimeCalendar = null;
         //车位费用续租
         for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
-            //后付费 加一个月
-            if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())){
+            //后付费 或者信用期车辆 加一个月
+            if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())
+                    || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())){
                 endTimeCalendar = Calendar.getInstance();
                 endTimeCalendar.setTime(feeEndTime);
                 endTimeCalendar.add(Calendar.MONTH,1);

service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java

@@ -390,8 +390,9 @@ public class PayFeeConfirmCmd extends Cmd {
             return;
         }
         for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
-            //后付费 加一个月
-            if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())) {
+            //后付费 或者信用期车辆 加一个月
+            if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())
+                    || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())){
                 endTimeCalendar = Calendar.getInstance();
                 endTimeCalendar.setTime(feeEndTime);
                 endTimeCalendar.add(Calendar.MONTH, 1);

service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java

@@ -437,8 +437,9 @@ public class PayOweFeeCmd extends Cmd {
         Calendar endTimeCalendar = null;
         //车位费用续租
         for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
-            //后付费 加一个月
-            if (FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())) {
+            //后付费 或者信用期车辆 加一个月
+            if(FeeConfigDto.PAYMENT_CD_AFTER.equals(feeDtos.get(0).getPaymentCd())
+                    || OwnerCarDto.CAR_TYPE_CREDIT.equals(tmpOwnerCarDto.getCarType())){
                 endTimeCalendar = Calendar.getInstance();
                 endTimeCalendar.setTime(feeEndTime);
                 endTimeCalendar.add(Calendar.MONTH, 1);