From 3b3de4b1896be48c8787c9159929f8d860982a79 Mon Sep 17 00:00:00 2001
From: Fanjc <271366833@qq.com>
Date: Thu, 21 Mar 2024 03:12:08 +0000
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0unionid=EF=BC=8Csql=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=87=AA=E5=B7=B1=E5=8A=A0=E4=B8=80=E4=B8=8Bunionid?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fanjc <271366833@qq.com>
---
 .../module/mp/controller/admin/user/vo/MpUserPageReqVO.java  | 3 +++
 .../module/mp/controller/admin/user/vo/MpUserRespVO.java     | 3 +++
 .../iocoder/yudao/module/mp/convert/user/MpUserConvert.java  | 1 +
 .../yudao/module/mp/dal/dataobject/user/MpUserDO.java        | 5 +++++
 4 files changed, 12 insertions(+)

diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
index 84f7187dd..e5f10e1a4 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
@@ -21,6 +21,9 @@ public class MpUserPageReqVO extends PageParam {
     @Schema(description = "公众号粉丝标识，模糊匹配", example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
     private String openid;
 
+    @Schema(description = "微信生态唯一标识，模糊匹配", example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
+    private String unionid;
+
     @Schema(description = "公众号粉丝昵称，模糊匹配", example = "芋艿")
     private String nickname;
 
diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java
index 653171ecb..32c2f3a5f 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserRespVO.java
@@ -17,6 +17,9 @@ public class MpUserRespVO  {
     @Schema(description = "公众号粉丝标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
     private String openid;
 
+     @Schema(description = "微信生态唯一标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
+    private String unionid;
+
     @Schema(description = "关注状态 参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer subscribeStatus;
     @Schema(description = "关注时间", requiredMode = Schema.RequiredMode.REQUIRED)
diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/user/MpUserConvert.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/user/MpUserConvert.java
index 9ad7edf74..6fbf41c6e 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/user/MpUserConvert.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/convert/user/MpUserConvert.java
@@ -29,6 +29,7 @@ public interface MpUserConvert {
 
     @Mappings(value = {
             @Mapping(source = "openId", target = "openid"),
+            @Mapping(source = "unionId", target = "unionid"),
             @Mapping(source = "headImgUrl", target = "headImageUrl"),
             @Mapping(target = "subscribeTime", ignore = true), // 单独转换
     })
diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/user/MpUserDO.java b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/user/MpUserDO.java
index 0b937759e..78fa940db 100644
--- a/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/user/MpUserDO.java
+++ b/yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/user/MpUserDO.java
@@ -38,6 +38,11 @@ public class MpUserDO extends BaseDO {
      * 粉丝标识
      */
     private String openid;
+
+     /**
+     * 微信生态唯一标识
+     */
+    private String unionid;
     /**
      * 关注状态
      *