From 70576ce70acade1c03a720e37d480cc68e52abf2 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 19 Jul 2021 15:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=EF=BC=9A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gamecommon/src/main/java/util/TimeUtils.java | 19 +++++++++++++++++++ .../java/com/ljsd/jieling/util/ToolsUtil.java | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 36eef416b..630502e3e 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -861,6 +861,25 @@ public class TimeUtils { return ca.getTimeInMillis(); } + /** + * 获取某个时间戳当前月份最后一天23:59:59秒时间戳 + */ + public static long getMonthEndTime(Long time){ + //获取当前月最后一天 + Calendar ca = Calendar.getInstance(); + ca.setTimeInMillis(time); + ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH)); + //将小时至0 + ca.set(Calendar.HOUR_OF_DAY, 23); + //将分钟至0 + ca.set(Calendar.MINUTE, 59); + //将秒至0 + ca.set(Calendar.SECOND,59); + //将毫秒至0 + ca.set(Calendar.MILLISECOND, 1000); + return ca.getTimeInMillis(); + } + /** * x:第几天 * next:距离当前月几个月 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java index 91f082cff..d74b3e645 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ToolsUtil.java @@ -29,7 +29,7 @@ public class ToolsUtil { } }else if(type ==2){ if(baseTime ==1){ - startTime = TimeUtils.getCurMonthEndTime(); + startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime()); }else{ startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime); }