v1.3.3 修复极端情况下八字转公历时刻出现遗漏的问题；优化代码。

Author: 6tail

CHANGELOG.md

@@ -91,3 +91,7 @@
 2. 修复：干支月推移错误。
 3. 优化：宜忌。
 4. 修改：2018之后的△T参数。
+
+## [1.3.3] - 2025-09-08
+1. 修复：极端情况下八字转公历时刻出现遗漏的问题。
+2. 优化：代码。

src/culture/fetus/FetusDay.php

@@ -71,12 +71,12 @@ function getName(): string
 
         $s .= ' ';
 
-        $directionName = $this->direction->getName();
         if (Side::IN == $this->side) {
             $s .= '房';
         }
         $s .= $this->side->getName();
 
+        $directionName = $this->direction->getName();
         if (Side::OUT == $this->side && str_contains('北南西东', $directionName)) {
             $s .= '正';
         }

src/eightchar/EightChar.php

@@ -217,6 +217,9 @@ function getSolarTimes(int $startYear, int $endYear): array
                         $s = $solarTime->getSecond();
                     }
                     $time = SolarTime::fromYmdHms($solarDay->getYear(), $solarDay->getMonth(), $solarDay->getDay(), $hour, $mi, $s);
+                    if ($d == 30) {
+                        $time = $time->next(-3600);
+                    }
                     // 验证一下
                     if ($time->getLunarHour()->getEightChar()->equals($this)) {
                         $l[] = $time;

src/jd/JulianDay.php

@@ -45,8 +45,8 @@ static function fromYmdHms(int $year, int $month, int $day, int $hour, int $minu
             $year--;
         }
         if ($g) {
-            $n = intdiv($year, 100);
-            $n = 2 - $n + intdiv($n, 4);
+            $n = (int)($year * 0.01);
+            $n = 2 - $n + (int)($n * 0.25);
         }
         return static::fromJulianDay((int)(365.25 * ($year + 4716)) + (int)(30.6001 * ($month + 1)) + $d + $n - 1524.5);
     }
@@ -88,26 +88,26 @@ function getSolarDay(): SolarDay
      */
     function getSolarTime(): SolarTime
     {
-        $d = (int)($this->day + 0.5);
-        $f = $this->day + 0.5 - $d;
+        $n = (int)($this->day + 0.5);
+        $f = $this->day + 0.5 - $n;
 
-        if ($d >= 2299161) {
-            $c = (int)(($d - 1867216.25) / 36524.25);
-            $d += 1 + $c - intdiv($c, 4);
+        if ($n >= 2299161) {
+            $c = (int)(($n - 1867216.25) / 36524.25);
+            $n += 1 + $c - intdiv($c, 4);
         }
-        $d += 1524;
-        $year = (int)(($d - 122.1) / 365.25);
-        $d -= (int)(365.25 * $year);
-        $month = (int)($d / 30.601);
-        $d -= (int)(30.601 * $month);
-        $day = $d;
-        if ($month > 13) {
-            $month -= 12;
+        $n += 1524;
+        $y = (int)(($n - 122.1) / 365.25);
+        $n -= (int)(365.25 * $y);
+        $m = (int)($n / 30.601);
+        $n -= (int)(30.601 * $m);
+        $d = $n;
+        if ($m > 13) {
+            $m -= 12;
         } else {
-            $year -= 1;
+            $y -= 1;
         }
-        $month -= 1;
-        $year -= 4715;
+        $m -= 1;
+        $y -= 4715;
         $f *= 24;
         $hour = (int)$f;
 
@@ -118,7 +118,7 @@ function getSolarTime(): SolarTime
         $f -= $minute;
         $f *= 60;
         $second = (int)round($f);
-        return $second < 60 ? SolarTime::fromYmdHms($year, $month, $day, $hour, $minute, $second) : SolarTime::fromYmdHms($year, $month, $day, $hour, $minute, $second - 60)->next(60);
+        return $second < 60 ? SolarTime::fromYmdHms($y, $m, $d, $hour, $minute, $second) : SolarTime::fromYmdHms($y, $m, $d, $hour, $minute, $second - 60)->next(60);
     }
 
     /**

src/lunar/LunarDay.php

@@ -243,11 +243,9 @@ function getNineStar(): NineStar
     {
         $d = $this->getSolarDay();
         $dongZhi = SolarTerm::fromIndex($d->getYear(), 0);
-        $xiaZhi = $dongZhi->next(12);
-        $dongZhi2 = $dongZhi->next(24);
         $dongZhiSolar = $dongZhi->getJulianDay()->getSolarDay();
-        $xiaZhiSolar = $xiaZhi->getJulianDay()->getSolarDay();
-        $dongZhiSolar2 = $dongZhi2->getJulianDay()->getSolarDay();
+        $xiaZhiSolar = $dongZhi->next(12)->getJulianDay()->getSolarDay();
+        $dongZhiSolar2 = $dongZhi->next(24)->getJulianDay()->getSolarDay();
         $dongZhiIndex = $dongZhiSolar->getLunarDay()->getSixtyCycle()->getIndex();
         $xiaZhiIndex = $xiaZhiSolar->getLunarDay()->getSixtyCycle()->getIndex();
         $dongZhiIndex2 = $dongZhiSolar2->getLunarDay()->getSixtyCycle()->getIndex();

src/lunar/LunarHour.php

@@ -273,8 +273,7 @@ function getSixtyCycle(): SixtyCycle
         if ($this->hour >= 23) {
             $d = $d->next(1);
         }
-        $heavenStemIndex = $d->getHeavenStem()->getIndex() % 5 * 2 + $earthBranchIndex;
-        return SixtyCycle::fromName(sprintf('%s%s', HeavenStem::fromIndex($heavenStemIndex)->getName(), EarthBranch::fromIndex($earthBranchIndex)->getName()));
+        return SixtyCycle::fromName(sprintf('%s%s', HeavenStem::fromIndex($d->getHeavenStem()->getIndex() % 5 * 2 + $earthBranchIndex)->getName(), EarthBranch::fromIndex($earthBranchIndex)->getName()));
     }
 
     /**
@@ -296,14 +295,14 @@ function getNineStar(): NineStar
     {
         $solar = $this->day->getSolarDay();
         $dongZhi = SolarTerm::fromIndex($solar->getYear(), 0);
-        $xiaZhi = $dongZhi->next(12);
-        $asc = !$solar->isBefore($dongZhi->getJulianDay()->getSolarDay()) && $solar->isBefore($xiaZhi->getJulianDay()->getSolarDay());
-        $start = [8, 5, 2][$this->day->getSixtyCycle()->getEarthBranch()->getIndex() % 3];
-        if ($asc) {
-            $start = 8 - $start;
-        }
         $earthBranchIndex = $this->getIndexInDay() % 12;
-        return NineStar::fromIndex($start + ($asc ? $earthBranchIndex : -$earthBranchIndex));
+        $index = [8, 5, 2][$this->day->getSixtyCycle()->getEarthBranch()->getIndex() % 3];
+        if (!$solar->isBefore($dongZhi->getJulianDay()->getSolarDay()) && $solar->isBefore($dongZhi->next(12)->getJulianDay()->getSolarDay())) {
+            $index = 8 + $earthBranchIndex - $index;
+        } else {
+            $index -= $earthBranchIndex;
+        }
+        return NineStar::fromIndex($index);
     }
 
     /**

src/lunar/LunarMonth.php

@@ -84,8 +84,7 @@ protected function __construct(int $year, int $month, ?array $cache = null)
             }
 
             // 冬至
-            $dongZhi = SolarTerm::fromIndex($year, 0);
-            $dongZhiJd = $dongZhi->getCursoryJulianDay();
+            $dongZhiJd = SolarTerm::fromIndex($year, 0)->getCursoryJulianDay();
 
             // 冬至前的初一，今年首朔的日月黄经差
             $w = ShouXingUtil::calcShuo($dongZhiJd);
@@ -359,7 +358,7 @@ function getJupiterDirection(): Direction
     {
         $sixtyCycle = $this->getSixtyCycle();
         $n = [7, -1, 1, 3][$sixtyCycle->getEarthBranch()->next(-2)->getIndex() % 4];
-        return $n == -1 ? $sixtyCycle->getHeavenStem()->getDirection() : Direction::fromIndex($n);
+        return $n != -1 ? Direction::fromIndex($n) : $sixtyCycle->getHeavenStem()->getDirection();
     }
 
     /**