Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2435' into release

develop
release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
09cfbaff04
2 измененных файлов: 19 добавлений и 23 удалений
  1. +18
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +1
    -5
      mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml

+ 18
- 18
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -1233,26 +1233,26 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (expiredDay > timePeriod) { if (expiredDay > timePeriod) {
rent.setExpiredDay((long) expiredDay); 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 { } 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; return rent;
} }


+ 1
- 5
mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml Просмотреть файл

@@ -86,12 +86,8 @@
</if> </if>
group by `meter_id` group by `meter_id`
) temp ) temp
where
create_time = temp.maxTime
<if test=" null != meterId ">
on create_time = temp.maxTime
and meter_id = temp.maxMeterId and meter_id = temp.maxMeterId
</if>

</select> </select>






Загрузка…
Отмена
Сохранить