|
|
|
@@ -904,6 +904,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
&& !isFirstDay(wxRentContract.getRentalStartDate()) |
|
|
|
&& (wxRentContract.getLease() % wxRentContract.getReceivePeriod() == 0) |
|
|
|
&& isLastYesr |
|
|
|
|
|
|
|
){ |
|
|
|
paycount ++; |
|
|
|
} |
|
|
|
@@ -1081,6 +1082,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
wxBillRent.setEndtime(wxRentContract.getRentalEndDate()); |
|
|
|
} |
|
|
|
|
|
|
|
SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
System.out.println(s.format(wxBillRent.getStarttime())); |
|
|
|
System.out.println(s.format(wxBillRent.getEndtime())); |
|
|
|
int[] diff = DateUtils.getDiff(wxBillRent.getStarttime(),wxBillRent.getEndtime()); |
|
|
|
needpay = diff[0]*price; |
|
|
|
|
|
|
|
|