Kaynağa Gözat

优化费用离散月调试

Your Name 2 yıl önce
ebeveyn
işleme
22a5887160

+ 7 - 2
service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java

@@ -118,7 +118,12 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
 
     private void doGeneratorTimeMonthData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date startTime, Date endTime) {
        // double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(startTime, endTime));
-
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(endTime);
+        calendar.add(Calendar.DAY_OF_MONTH,-1);
+        if(startTime.getTime()< calendar.getTime().getTime()){
+            endTime = calendar.getTime();
+        }
         List<String> months = DateUtil.getMonthBetweenDate(startTime,endTime);
 
         if (months == null || months.size() < 1) {
@@ -145,7 +150,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
             detailYear = Integer.parseInt(month.split("-")[0]);
             detailMonth = Integer.parseInt(month.split("-")[1]);
 
-            Calendar calendar = Calendar.getInstance();
+            calendar = Calendar.getInstance();
             calendar.setTime(startTime);
             calendar.set(Calendar.YEAR, detailYear);
             calendar.set(Calendar.MONTH, detailMonth-1);