From 6d383fa90e1b9315b3bfce48ba4f8e1339ae20ae Mon Sep 17 00:00:00 2001
From: Daniel Qian <chanjarster@gmail.com>
Date: Tue, 27 Jan 2015 13:34:14 +0800
Subject: [PATCH] =?UTF-8?q?issue=20#90=20WxMpUser=E6=B7=BB=E5=8A=A0sexId?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=92=8C=E5=BE=AE=E4=BF=A1=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/mp/bean/result/WxMpUser.java | 17 +++++++++++++++--
 .../weixin/mp/util/json/WxMpGsonBuilder.java    |  2 +-
 ...sonAdapter.java => WxMpUserGsonAdapter.java} |  9 +++++----
 3 files changed, 21 insertions(+), 7 deletions(-)
 rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/{WxUserGsonAdapter.java => WxMpUserGsonAdapter.java} (87%)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
index 554a07dbf..e9e1d17dc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -20,7 +20,11 @@ public class WxMpUser {
   protected String headImgUrl;
   protected Long subscribeTime;
   protected String unionId;
-  
+  protected Integer sexId;
+
+  public Boolean getSubscribe() {
+    return subscribe;
+  }
   public Boolean isSubscribe() {
     return subscribe;
   }
@@ -87,7 +91,16 @@ public class WxMpUser {
   public void setUnionId(String unionId) {
     this.unionId = unionId;
   }
-  
+
+  public Integer getSexId() {
+
+    return sexId;
+  }
+
+  public void setSexId(Integer sexId) {
+    this.sexId = sexId;
+  }
+
   public static WxMpUser fromJson(String json) {
     return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUser.class);
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
index 73083d8c4..132c0415e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -16,7 +16,7 @@ public class WxMpGsonBuilder {
     INSTANCE.registerTypeAdapter(WxMpMassGroupMessage.class, new WxMpMassGroupMessageGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMassOpenIdsMessage.class, new WxMpMassOpenIdsMessageGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpGroup.class, new WxMpGroupGsonAdapter());
-    INSTANCE.registerTypeAdapter(WxMpUser.class, new WxUserGsonAdapter());
+    INSTANCE.registerTypeAdapter(WxMpUser.class, new WxMpUserGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpUserList.class, new WxUserListGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMassVideo.class, new WxMpMassVideoAdapter());
     INSTANCE.registerTypeAdapter(WxMpMassSendResult.class, new WxMpMassSendResultAdapter());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
similarity index 87%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserGsonAdapter.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
index 462994f61..ba6caaacb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -14,7 +14,7 @@ import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
 import java.lang.reflect.Type;
 
-public class WxUserGsonAdapter implements JsonDeserializer<WxMpUser> {
+public class WxMpUserGsonAdapter implements JsonDeserializer<WxMpUser> {
 
   public WxMpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
     JsonObject o = json.getAsJsonObject();
@@ -29,10 +29,11 @@ public class WxUserGsonAdapter implements JsonDeserializer<WxMpUser> {
     wxMpUser.setProvince(GsonHelper.getString(o, "province"));
     wxMpUser.setSubscribeTime(GsonHelper.getLong(o, "subscribe_time"));
     wxMpUser.setUnionId(GsonHelper.getString(o, "unionid"));
-    Integer sex = GsonHelper.getInteger(o, "sex");
-    if(new Integer(1).equals(sex)) {
+    Integer sexId = GsonHelper.getInteger(o, "sex");
+    wxMpUser.setSexId(sexId);
+    if(new Integer(1).equals(sexId)) {
       wxMpUser.setSex("男");
-    } else if (new Integer(2).equals(sex)) {
+    } else if (new Integer(2).equals(sexId)) {
       wxMpUser.setSex("女");
     } else {
       wxMpUser.setSex("未知");