|
|
@@ -287,7 +287,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { |
|
|
ratio = wxRentContract.getPayRatio(); |
|
|
ratio = wxRentContract.getPayRatio(); |
|
|
}else{ |
|
|
}else{ |
|
|
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ |
|
|
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ |
|
|
long dayCount = DateUtils.startToEnd(record.getStarttime(),record.getEndtime()); |
|
|
|
|
|
|
|
|
long dayCount = DateUtils.startToEnd(wxBillRent.getStarttime(),wxBillRent.getEndtime()); |
|
|
if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ |
|
|
if(EnumBusRatioTime.YEAR.getCode().equals(wxRentContract.getBusDiscountTime())){ |
|
|
if(startInt == endInt && months == 12){ |
|
|
if(startInt == endInt && months == 12){ |
|
|
//刚好1年 |
|
|
//刚好1年 |
|
|
|