diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java index 5e1d14dc..25ebc8ad 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java @@ -371,12 +371,10 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { return users; } - private void calculateUserAllHolidays(Map> userQuotaMap, Long - userId, Map holidayUserDOMap, - HolidaySettingDO holidaySetting, HolidayBalanceSettingDO - holidayBalanceSettingDO, List newHolidayUserRecordDOList, - List newHolidayUserDOList, LocalDateTime now, String remark, Integer direction, String - reason) { + private void calculateUserAllHolidays(Map> userQuotaMap, Long userId, Map holidayUserDOMap, + HolidaySettingDO holidaySetting, HolidayBalanceSettingDO holidayBalanceSettingDO, + List newHolidayUserRecordDOList, List newHolidayUserDOList, + LocalDateTime now, String remark, Integer direction, String reason) { Map stringBigDecimalMap = userQuotaMap.get(userId); if (MapUtil.isNotEmpty(stringBigDecimalMap)) { HolidayUserDO holidayUserDO = holidayUserDOMap.get(userId); @@ -395,6 +393,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { holidayUserRecordDO.setExpiredTime(expiredTime); LocalDateTime expirationReminderTime = expiredTime == null ? null : expiredTime.minusDays(holidayBalanceSettingDO.getReminderTimeNum()); holidayUserRecordDO.setExpirationReminderTime(expirationReminderTime); + holidayUserRecordDO.setExpirationReminderFlag(holidayBalanceSettingDO.getExpirationReminderFlag() == 0 ? 1 : 0); holidayUserRecordDO.setRemainingBalance(localDateTimeBigDecimalEntry.getValue()); holidayUserRecordDO.setRemark(remark + localDateTimeBigDecimalEntry.getValue() + (holidaySetting.getMinUnit() == 3 ? "小时" : "天") + holidaySetting.getName()); holidayUserRecordDO.setReason(reason); @@ -425,12 +424,10 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { } - private void calculateUserHolidays(Map userQuotaMap, Long - userId, Map holidayUserDOMap, - HolidaySettingDO holidaySetting, HolidayBalanceSettingDO - holidayBalanceSettingDO, List newHolidayUserRecordDOList, - List newHolidayUserDOList, LocalDateTime now, String remark, Integer direction, String - reason) { + private void calculateUserHolidays(Map userQuotaMap, Long userId, Map holidayUserDOMap, + HolidaySettingDO holidaySetting, HolidayBalanceSettingDO holidayBalanceSettingDO, + List newHolidayUserRecordDOList, List newHolidayUserDOList, + LocalDateTime now, String remark, Integer direction, String reason) { BigDecimal quota = userQuotaMap.get(userId); // -- 如果是0的话就不记录了 if (quota == null || BigDecimal.ZERO.compareTo(quota) == 0) { @@ -451,7 +448,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService { holidayUserRecordDO.setExpiredTime(expiredTime); LocalDateTime expirationReminderTime = expiredTime == null ? null : expiredTime.minusDays(holidayBalanceSettingDO.getReminderTimeNum()); holidayUserRecordDO.setExpirationReminderTime(expirationReminderTime); - holidayUserRecordDO.setExpirationReminderFlag(expirationReminderTime == null ? 1 : 0); + holidayUserRecordDO.setExpirationReminderFlag(holidayBalanceSettingDO.getExpirationReminderFlag() == 0 ? 1 : (expirationReminderTime == null ? 1 : 0)); holidayUserRecordDO.setRemainingBalance(quota); } else { // -- 如果是扣除or提醒的话 这里直接是1 避免计算过期的时候再把他查出来