优化修改费用项代码

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

@@ -1718,6 +1718,9 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate);//目标结束时间
             }
 
+            //todo 减去一秒
+            targetEndDate = DateUtil.getDateFromStringA(DateUtil.getPreSecTime(targetEndDate));
+
             //todo 费用项的结束时间<缴费的结束时间  费用快结束了   取费用项的结束时间
             if (maxEndTime.getTime() < targetEndDate.getTime()) {
                 targetEndDate = maxEndTime;

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -945,4 +945,16 @@ public class DateUtil {
         calendar.add(Calendar.SECOND, 1);
         return getFormatTimeStringA(calendar.getTime());
     }
+
+    public static String getPreSecTime(String time) {
+        Date tTime = getDateFromStringA(time);
+        return getPreSecTime(tTime);
+    }
+
+    public static String getPreSecTime(Date time) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        calendar.add(Calendar.SECOND, -1);
+        return getFormatTimeStringA(calendar.getTime());
+    }
 }