## Opt - 业绩列表-复购取昨天(23:59:59)
This commit is contained in:
parent
3592f27961
commit
29da9bb16d
|
@ -480,6 +480,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
if(isCurrentMonth(param.getYear(), param.getMonth())) {
|
if(isCurrentMonth(param.getYear(), param.getMonth())) {
|
||||||
targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
|
targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
|
||||||
targetDayEnd = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
|
targetDayEnd = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||||
|
targetDayEnd = DateUtils.getEndOfDay(targetDayEnd);
|
||||||
settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
|
settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
|
||||||
}else{
|
}else{
|
||||||
settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
|
settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
|
||||||
|
|
|
@ -918,4 +918,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
||||||
return daysStrList;
|
return daysStrList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Date getEndOfDay(Date date) {
|
||||||
|
LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
||||||
|
LocalDateTime endOfDay = localDateTime.withHour(23).withMinute(59).withSecond(59).withNano(999999999);
|
||||||
|
return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue