zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复ChineseDate 闰年闰月节日获取问题

Browse Source
This commit is contained in:
Looly
2025-07-10 11:54:13 +08:00
parent e6e32a76b9
commit 8ad16be6cb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hutool-core/src/main/java/cn/hutool/v7/core/date/chinese/ChineseDate.java
View File

@@ -345,7 +345,7 @@ public class ChineseDate {
* @return 获得农历节日 * @return 获得农历节日
*/ */
public String getFestivals() { public String getFestivals() {
return StrUtil.join(",", LunarFestival.getFestivals(this.year, this.month, day)); return StrUtil.join(",", LunarFestival.getFestivals(this.year, this.isLeapMonth ? this.month - 1 : this.month, day));
} }
/** /**
@@ -411,7 +411,7 @@ public class ChineseDate {
* @since 6.0.0 * @since 6.0.0
*/ */
public String toString(ChineseDateFormat format) { public String toString(ChineseDateFormat format) {
if(null == format){ if (null == format) {
format = ChineseDateFormat.MIX; format = ChineseDateFormat.MIX;
} }
@@ -420,12 +420,12 @@ public class ChineseDate {
String normalizedYear = GanZhi.getGanzhiOfYear(year); String normalizedYear = GanZhi.getGanzhiOfYear(year);
String normalizedMonth = getChineseMonth(); String normalizedMonth = getChineseMonth();
String normalizedDay = getChineseDay(); String normalizedDay = getChineseDay();
switch (format){ switch (format) {
case GXSS: case GXSS:
dateTemplate = "农历{}" + getChineseZodiac() + "年{}{}"; dateTemplate = "农历{}" + getChineseZodiac() + "年{}{}";
normalizedMonth = getChineseMonthName(); normalizedMonth = getChineseMonthName();
break; break;
case XSS : case XSS:
normalizedYear = getChineseZodiac(); normalizedYear = getChineseZodiac();
break; break;
case GSG: case GSG:
@@ -439,7 +439,7 @@ public class ChineseDate {
break; break;
case MIX: case MIX:
//根据选择的格式返回不同标准化日期输出，默认为Mix //根据选择的格式返回不同标准化日期输出，默认为Mix
dateTemplate = "公元"+ this.year +"年农历{}年{}{}"; dateTemplate = "公元" + this.year + "年农历{}年{}{}";
case GSS: case GSS:
break; break;
default: default: