|
|
|
@@ -583,18 +583,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
long needpay; |
|
|
|
|
|
|
|
//当天也算,加1天 |
|
|
|
Date newEndDate = DateUtils.getDaySet(wxBillProperty.getEndtime(),Calendar.DATE,1); |
|
|
|
//Date newEndDate = DateUtils.getDaySet(wxBillRent.getEndtime(),Calendar.DATE,1); |
|
|
|
//按日 |
|
|
|
if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode())){ |
|
|
|
int dayCount = DateUtils.daysBetween(wxBillProperty.getStarttime(),newEndDate); |
|
|
|
needpay = dayCount*price; |
|
|
|
double needpayD = WxRentContractServiceImpl.getNeedPay(0,price,wxBillProperty.getStarttime(),wxBillProperty.getEndtime()); |
|
|
|
needpay = new Double(needpayD).longValue(); |
|
|
|
}else{ |
|
|
|
//按月 |
|
|
|
int[] diff = DateUtils.getDiff(wxBillProperty.getStarttime(),newEndDate); |
|
|
|
needpay = diff[0]*price; |
|
|
|
|
|
|
|
double oneDayProce = (double) price/DateUtils.getMonthDayCount(wxPropertyContract.getRentalEndDate()); |
|
|
|
needpay += diff[1] * oneDayProce; |
|
|
|
double needpayD = WxRentContractServiceImpl.getNeedPay(price,0,wxBillProperty.getStarttime(),wxBillProperty.getEndtime()); |
|
|
|
needpay = new Double(needpayD).longValue(); |
|
|
|
} |
|
|
|
wxBillProperty.setNeedPay(needpay); |
|
|
|
wxBillProperty.setOwe(needpay); |
|
|
|
|