diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 00fc9ef0b..03afa4958 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1233,26 +1233,26 @@ public class WxBillAllServiceImpl implements WxBillAllService { if (expiredDay > timePeriod) { rent.setExpiredDay((long) expiredDay); } - } else { - Date now = new Date(); - int day = DateUtils.daysBetween(startDate, now); - int timePeriod = 0; - if (day < timePeriod) { - rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); - long expiredDay = Long.valueOf(Math.abs(day)); - rent.setExpiredDay(expiredDay); + return rent; + } + Date now = new Date(); + int day = DateUtils.daysBetween(startDate, now); + int timePeriod = 0; + if (day > timePeriod) { + rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); + rent.setExpiredDay((long) day); + return rent; + } + if (flag) { + timePeriod = 30; + long expiredDay = Long.valueOf(Math.abs(day)); + if (expiredDay > timePeriod) { + rent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); } else { - if (flag) { - timePeriod = 30; - if (day > timePeriod) { - rent.setStatus(EnumBillRentStatus.NOT_EXPIRED.getCode()); - } else { - rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - } - } else { - rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); - } + rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } + } else { + rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode()); } return rent; } diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 1ceb4d0b4..8c76f0691 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -86,12 +86,8 @@ group by `meter_id` ) temp - where - create_time = temp.maxTime - + on create_time = temp.maxTime and meter_id = temp.maxMeterId - -