|
|
|
@@ -2018,6 +2018,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
Double total = new Double(0); |
|
|
|
int[] diff; |
|
|
|
|
|
|
|
System.out.println(sd.format(start)); |
|
|
|
System.out.println(sd.format(end)); |
|
|
|
|
|
|
|
//同一天 |
|
|
|
if(sd.format(start).equals(sd.format(end))){ |
|
|
|
int dayCount = DateUtils.getMonthDayCount(start); |
|
|
|
@@ -2026,8 +2029,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
//同月 |
|
|
|
if(sdM.format(start).equals(sdM.format(end))){ |
|
|
|
System.out.println(sd.format(start)); |
|
|
|
System.out.println(sd.format(end)); |
|
|
|
|
|
|
|
diff = DateUtils.getDiff(start,end); |
|
|
|
int dayCount = DateUtils.getMonthDayCount(start); |
|
|
|
@@ -2040,8 +2041,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(end,Calendar.DATE,1))); |
|
|
|
|
|
|
|
if(startInt == endInt){ |
|
|
|
int months = getMonths(sdM.format(start)+"-01",sdM.format(end)+"-01"); |
|
|
|
return (months+1) * price; |
|
|
|
int months = getMonths(sdM.format(start)+"-01",sdM.format(DateUtils.getDaySet(end,Calendar.DATE,1))+"-01"); |
|
|
|
return (months) * price; |
|
|
|
} |
|
|
|
|
|
|
|
//第一个月 |
|
|
|
|