From e1d274811c08f32fd240162bd73ef27c8d797785 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 9 Apr 2018 20:36:23 +0800
Subject: [PATCH] =?UTF-8?q?#528=20WxMpUser=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=B1=9E=E6=80=A7=EF=BC=9Asubscribe=5Fscene?=
 =?UTF-8?q?=E3=80=81=20qr=5Fscene=20=E5=92=8Cqr=5Fscene=5Fstr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/bean/result/WxMpUser.java       | 25 ++++++++++++++++---
 .../mp/util/json/WxMpUserGsonAdapter.java     |  3 +++
 2 files changed, 24 insertions(+), 4 deletions(-)

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 6cd9ca063..5d9c6bce2 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
@@ -1,5 +1,9 @@
 package me.chanjar.weixin.mp.bean.result;
 
+import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.List;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
@@ -7,10 +11,6 @@ import lombok.Data;
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
-import java.io.Serializable;
-import java.lang.reflect.Type;
-import java.util.List;
-
 /**
  * 微信用户信息.
  *
@@ -56,6 +56,23 @@ public class WxMpUser implements Serializable {
    */
   private String[] privileges;
 
+  /**
+   * subscribe_scene 返回用户关注的渠道来源.
+   * ADD_SCENE_SEARCH 公众号搜索，ADD_SCENE_ACCOUNT_MIGRATION 公众号迁移，ADD_SCENE_PROFILE_CARD 名片分享，ADD_SCENE_QR_CODE 扫描二维码，ADD_SCENEPROFILE LINK 图文页内名称点击，ADD_SCENE_PROFILE_ITEM 图文页右上角菜单，ADD_SCENE_PAID 支付后关注，ADD_SCENE_OTHERS 其他
+   */
+  private String subscribeScene;
+
+  /**
+   * qr_scene 二维码扫码场景（开发者自定义）.
+   */
+  private String qrScene;
+
+  /**
+   * qr_scene_str 二维码扫码场景描述（开发者自定义）.
+   */
+  private String qrSceneStr;
+
+
   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/WxMpUserGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
index 956fda8bf..910ae8c89 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpUserGsonAdapter.java
@@ -33,6 +33,9 @@ public class WxMpUserGsonAdapter implements JsonDeserializer<WxMpUser> {
     user.setGroupId(GsonHelper.getInteger(o, "groupid"));
     user.setTagIds(GsonHelper.getLongArray(o, "tagid_list"));
     user.setPrivileges(GsonHelper.getStringArray(o, "privilege"));
+    user.setSubscribeScene(GsonHelper.getString(o, "subscribe_scene"));
+    user.setQrScene(GsonHelper.getString(o, "qr_scene"));
+    user.setQrSceneStr(GsonHelper.getString(o, "qr_scene_str"));
 
     Integer sex = GsonHelper.getInteger(o, "sex");
     if (sex != null) {