From d19b349d9ae6949d9d9bcda08bbf75b688f0eb43 Mon Sep 17 00:00:00 2001
From: godcong <jumbycc@163.com>
Date: Fri, 8 Nov 2019 23:27:47 +0800
Subject: [PATCH] update chronos

---
 lunar.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lunar.go b/lunar.go
index 6ae676e..2179fdd 100644
--- a/lunar.go
+++ b/lunar.go
@@ -43,8 +43,12 @@ func (lunar *Lunar) Calendar() Calendar {
 }
 
 // EightCharacter ...
-func (lunar *Lunar) EightCharacter() []string {
-	rlt := lunar.nianZhu() + lunar.yueZhu() + lunar.riZhu() + lunar.shiZhu()
+func (lunar *Lunar) EightCharacter(fix ...int) []string {
+	rlt := lunar.nianZhu(0)
+	if fix != nil {
+		rlt = lunar.nianZhu(fix[0])
+	}
+	rlt += lunar.yueZhu() + lunar.riZhu() + lunar.shiZhu()
 	return strings.Split(rlt, "")
 }
 
@@ -64,10 +68,10 @@ func (lunar *Lunar) yueZhu() string {
 }
 
 //nianZhu 年柱
-func (lunar *Lunar) nianZhu() string {
+func (lunar *Lunar) nianZhu(fix int) string {
 	//log.Println("year", lunar.Year(), "nyear", lunar.year, "month", lunar.Month(), "day", lunar.Day(), "lichun", getLiChunDay(lunar.Year()))
 	if lunar.Month() > 2 || (lunar.Month() == 2 && lunar.Day() >= getLiChunDay(lunar.Year())) {
-		return StemBranchYear(lunar.Year())
+		return StemBranchYear(lunar.Year() + fix)
 	}
 	return StemBranchYear(lunar.Year() - 1)
 }