From 8bb6b02cbaf36b18b5997dcc1f8787d1430a3442 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 25 May 2020 20:43:39 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#1580=20=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF=E9=87=8C=E6=80=A7?= =?UTF-8?q?=E5=88=AB=E5=AD=97=E6=AE=B5=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A00=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/cp/bean/Gender.java | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java index 2b6e26efd..d56bd57da 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/Gender.java @@ -1,5 +1,8 @@ package me.chanjar.weixin.cp.bean; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** *
  *  性别枚举
@@ -8,7 +11,13 @@ package me.chanjar.weixin.cp.bean;
  *
  * @author Binary Wang
  */
+@Getter
+@AllArgsConstructor
 public enum Gender {
+  /**
+   * 未定义
+   */
+  UNDEFINED("未定义", "0"),
   /**
    * 男
    */
@@ -18,28 +27,14 @@ public enum Gender {
    */
   FEMALE("女", "2");
 
-  private String genderName;
-  private String code;
-
-  Gender(String genderName, String code) {
-    this.genderName = genderName;
-    this.code = code;
-  }
-
-  public String getGenderName() {
-    return this.genderName;
-  }
-
-  public String getCode() {
-    return this.code;
-  }
+  private final String genderName;
+  private final String code;
 
   public static Gender fromCode(String code) {
-    if ("1".equals(code)) {
-      return Gender.MALE;
-    }
-    if ("2".equals(code)) {
-      return Gender.FEMALE;
+    for(Gender a: Gender.values()){
+      if(a.code.equals(code)){
+        return a;
+      }
     }
 
     return null;