java110 %!s(int64=5) %!d(string=hai) anos
pai
achega
9ea8e8f1a8

+ 3 - 3
service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java

@@ -153,10 +153,10 @@ public class ListFeeListener extends AbstractServiceApiListener {
             return targetEndDateAndOweMonth;
         }
         if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
-            if (feeDto.getImportFeeEndTime() == null) {
-                targetEndDate = feeDto.getConfigEndTime();
-            } else if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
+            if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
                 targetEndDate = feeDto.getCurReadingTime();
+            } else if (feeDto.getImportFeeEndTime() == null) {
+                targetEndDate = feeDto.getConfigEndTime();
             } else {
                 targetEndDate = feeDto.getImportFeeEndTime();
             }