From 18a6a0a09a128aa7e096de5c5ef1fc7166896ab2 Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Sun, 5 Apr 2020 23:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=98=9F?=
 =?UTF-8?q?=E5=BA=A7=E7=9A=84=E6=96=B9=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nlf/calendar/Solar.java | 37 ++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nlf/calendar/Solar.java b/src/main/java/com/nlf/calendar/Solar.java
index 913a69c..fba9515 100644
--- a/src/main/java/com/nlf/calendar/Solar.java
+++ b/src/main/java/com/nlf/calendar/Solar.java
@@ -174,6 +174,7 @@ public class Solar{
    * 获取星座
    *
    * @return 星座
+   * @deprecated 使用getXingZuo
    */
   public String getXingzuo(){
     int index = 11,m = month,d = day;
@@ -204,6 +205,40 @@ public class Solar{
     return SolarUtil.XINGZUO[index];
   }
 
+  /**
+   * 获取星座
+   *
+   * @return 星座
+   */
+  public String getXingZuo(){
+    int index = 11,m = month,d = day;
+    int y = m*100+d;
+    if(y>=321&&y<=419){
+      index = 0;
+    }else if(y>=420&&y<=520){
+      index = 1;
+    }else if(y>=521&&y<=620){
+      index = 2;
+    }else if(y>=621&&y<=722){
+      index = 3;
+    }else if(y>=723&&y<=822){
+      index = 4;
+    }else if(y>=823&&y<=922){
+      index = 5;
+    }else if(y>=923&&y<=1022){
+      index = 6;
+    }else if(y>=1023&&y<=1121){
+      index = 7;
+    }else if(y>=1122&&y<=1221){
+      index = 8;
+    }else if(y>=1222||y<=119){
+      index = 9;
+    }else if(y<=218){
+      index = 10;
+    }
+    return SolarUtil.XINGZUO[index];
+  }
+
   /**
    * 获取年份
    *
@@ -274,7 +309,7 @@ public class Solar{
       s.append(")");
     }
     s.append(" ");
-    s.append(getXingzuo());
+    s.append(getXingZuo());
     s.append("座");
     return s.toString();
   }