|
|
|
@@ -2621,8 +2621,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if (null != jumpList && jumpList.size() > 0 ) {
|
|
|
|
//不是满时间段的,要按天来计算
|
|
|
|
if (!isFull) {
|
|
|
|
Date realEndStart = DateUtils.getDaySet(endDate, Calendar.SECOND, 1);
|
|
|
|
int[] diffs = DateUtils.getDiff(startDate, realEndStart);
|
|
|
|
int[] diffs = DateUtils.getDiff(startDate, endDate);
|
|
|
|
if (diffs[0] <= 0 ) {
|
|
|
|
if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) {
|
|
|
|
sales = sales.multiply(new BigDecimal(validDates.size())).divide(new BigDecimal(30),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|