lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2025-12-28 08:17:59 +08:00
Code Issues Projects Releases Wiki Activity

v1.3.6 中元节改为农历七月十五；修复Solar的nextMonth超期问题。

Browse Source
This commit is contained in:
6tail
2023-09-03 11:39:25 +08:00
parent d66cd71f44
commit ceac1afc3e
6 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nlf/calendar/Solar.java
View File

@@ -714,19 +714,17 @@ public class Solar {
int y = year + years;
int m = month;
int d = day;
// 2月处理
if (2 == m) {
if (1582 == y && 10 == m) {
if (d > 4 && d < 15) {
d += 10;
}
} else if (2 == m) {
if (d > 28) {
if (!SolarUtil.isLeapYear(y)) {
d = 28;
}
}
}
if (1582 == y && 10 == m) {
if (d > 4 && d < 15) {
d += 10;
}
}
return fromYmdHms(y, m, d, hour, minute, second);
}
@@ -740,18 +738,15 @@ public class Solar {
int y = month.getYear();
int m = month.getMonth();
int d = day;
// 2月处理
if (2 == m) {
if (d > 28) {
if (!SolarUtil.isLeapYear(y)) {
d = 28;
}
}
}
if (1582 == y && 10 == m) {
if (d > 4 && d < 15) {
d += 10;
}
} else {
int maxDay = SolarUtil.getDaysOfMonth(y, m);
if (d > maxDay) {
d = maxDay;
}
}
return fromYmdHms(y, m, d, hour, minute, second);
}