优化代码

java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java

@@ -126,7 +126,7 @@ public interface IComputeFeeSMO {
      * oweMonth:1.0
      * }
      */
-    public Map getTargetEndDateAndOweMonth(FeeDto feeDto);
+     Map getTargetEndDateAndOweMonth(FeeDto feeDto);
 
 
     /**
@@ -134,10 +134,10 @@ public interface IComputeFeeSMO {
      *
      * @return
      */
-    public Map getFeePrice(FeeDto feeDto);
+     Map getFeePrice(FeeDto feeDto);
 
 
-    public Map getFeePrice(FeeDto feeDto, RoomDto roomDto);
+     Map getFeePrice(FeeDto feeDto, RoomDto roomDto);
 
     /**
      * 时间差 按天折算

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -1644,10 +1644,11 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             if (preEndTime.getTime() <= DateUtil.getCurrentDate().getTime()) {
                 // 目标到期时间 - 到期时间 = 欠费月份
                 oweMonth = 1.0;
-                //todo 这里考虑 账单模式的场景
-                if (!StringUtil.isNumber(feeDto.getMonthCycle())) {
-                    oweMonth = Integer.parseInt(feeDto.getMonthCycle());
-                }
+            }
+
+            //todo 这里考虑 账单模式的场景
+            if (!StringUtil.isNumber(feeDto.getMonthCycle())) {
+                oweMonth = Integer.parseInt(feeDto.getMonthCycle());
             }
 
         } else if (FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeDto.getFeeFlag())) {

service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -152,6 +152,10 @@ public class QueryOweFeeImpl implements IQueryOweFee {
         customStartTime = feeDto.getCustomStartTime();
         customEndTime = feeDto.getCustomEndTime();
         feeDto = feeDtos.get(0);
+        //todo 考虑账单模式
+        if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag()) && StringUtil.isNumber(feeDto.getMonthCycle())) {
+            cycel = feeDto.getMonthCycle();
+        }
         if (!StringUtil.isEmpty(cycel)) {
             feeDto.setCycle(cycel);
         }
@@ -658,8 +662,6 @@ public class QueryOweFeeImpl implements IQueryOweFee {
     }
 
 
-
-
     private Date getTargetEndTime(double v, Date startDate) {
         Calendar endDate = Calendar.getInstance();
         endDate.setTime(startDate);