优化临时费用创建bug

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

@@ -133,7 +133,8 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         }
         if (feeDto.getEndTime().getTime() < targetEndDate.getTime()) {
             // 目标到期时间 - 到期时间 = 欠费月份
-            oweMonth = DateUtil.dayCompare(feeDto.getEndTime(), targetEndDate);
+            oweMonth = DateUtil.dayCompare(feeDto.getEndTime(), targetEndDate,true);
+
         }
 
         String computingFormula = feeDto.getComputingFormula();
@@ -1842,13 +1843,13 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         endDate.add(Calendar.MONTH, intMonth.intValue());
         double doubleMonth = month - intMonth;
         if (doubleMonth <= 0) {
-            endDate.add(Calendar.SECOND,-1);
+            endDate.add(Calendar.SECOND, -1);
             return endDate.getTime();
         }
         int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
         Double hour = doubleMonth * futureDay * 24;
         endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
-        endDate.add(Calendar.SECOND,-1);
+        endDate.add(Calendar.SECOND, -1);
         return endDate.getTime();
     }
 

service-fee/src/main/java/com/java110/fee/api/FeeApi.java

@@ -181,15 +181,15 @@ public class FeeApi extends BaseController {
             throw new IllegalArgumentException("费用对象或者业主不能都为空");
         }
         FeeDto feeDto = new FeeDto();
-        if(!StringUtil.isEmpty(payObjId)) {
+        if (!StringUtil.isEmpty(payObjId)) {
             if (payObjId.contains(",")) {
                 feeDto.setPayerObjIds(payObjId.split(","));
             } else {
                 feeDto.setPayerObjId(payObjId);
             }
         }
-        if(!StringUtil.isEmpty(targetEndTime)){
-            targetEndTime = DateUtil.getAddDayStringB(DateUtil.getDateFromStringB(targetEndTime),1);
+        if (!StringUtil.isEmpty(targetEndTime)) {
+            targetEndTime = targetEndTime + " 23:59:59";
             feeDto.setTargetEndTime(targetEndTime);
         }
         feeDto.setPayerObjType(payObjType);