diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java index 71f9f07..e11347e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java @@ -97,8 +97,8 @@ public class RightQueryServiceImpl implements RightQueryService { //时间 customerVo.setStartTime(firstRight.getStartTime()); customerVo.setEndTime(firstRight.getEndTime()); - customerVo.setRemainingDays((int) (Duration.between(LocalDateTime.now(), customerVo.getEndTime()).toDays() + 1)); - customerVo.setRemainingDays(customerVo.getRemainingDays() > 0 ? customerVo.getRemainingDays() : 0); + customerVo.setRemainingDays((int) (Duration.between(LocalDateTime.now(), customerVo.getEndTime()).toDays())); + customerVo.setRemainingDays(customerVo.getRemainingDays() > 0 ? customerVo.getRemainingDays() + 1 : 0); //单日使用上限 RightTerm dailyUseLimitRightTerm = getRightTermByName(firstRight, RightNameEnum.DAILY_USE_LIMIT); customerVo.setDailyUseLimit(Objects.nonNull(dailyUseLimitRightTerm) ? Integer.parseInt(dailyUseLimitRightTerm.getValue()) : -1); @@ -122,8 +122,8 @@ public class RightQueryServiceImpl implements RightQueryService { //时间 operatorVo.setStartTime(right.getStartTime()); operatorVo.setEndTime(right.getEndTime()); - operatorVo.setRemainingDays((int) (Duration.between(LocalDateTime.now(), operatorVo.getEndTime()).toDays() + 1)); - operatorVo.setRemainingDays(operatorVo.getRemainingDays() > 0 ? operatorVo.getRemainingDays() : 0); + operatorVo.setRemainingDays((int) (Duration.between(LocalDateTime.now(), operatorVo.getEndTime()).toDays())); + operatorVo.setRemainingDays(operatorVo.getRemainingDays() > 0 ? operatorVo.getRemainingDays() + 1 : 0); //权益上限额度 RightTerm rightLimitRightTerm = getRightTermByName(right, RightNameEnum.RIGHT_LIMIT); operatorVo.setRightLimit(Objects.nonNull(rightLimitRightTerm) ? Integer.parseInt(rightLimitRightTerm.getValue()) : -1);