Commit 55cae6d2aa8d3a5e333010d64f2fc835fe56916e

Authored by 绮梦
1 parent 287a17a9

feat: 获取用户信息接口增加areaName 字段。

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
@@ -43,6 +43,9 @@ public class MemberUserBaseVO { @@ -43,6 +43,9 @@ public class MemberUserBaseVO {
43 @Schema(description = "所在地", example = "4371") 43 @Schema(description = "所在地", example = "4371")
44 private Long areaId; 44 private Long areaId;
45 45
  46 + @Schema(description = "所在地可视化显示", example = "4371")
  47 + private String areaName;
  48 +
46 @Schema(description = "出生日期", example = "2023-03-12") 49 @Schema(description = "出生日期", example = "2023-03-12")
47 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) 50 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
48 private LocalDateTime birthday; 51 private LocalDateTime birthday;
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
@@ -5,9 +5,11 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; @@ -5,9 +5,11 @@ import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
  8 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
8 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 9 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
9 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
10 import org.mapstruct.Mapper; 11 import org.mapstruct.Mapper;
  12 +import org.mapstruct.Mapping;
11 import org.mapstruct.factory.Mappers; 13 import org.mapstruct.factory.Mappers;
12 14
13 import java.util.List; 15 import java.util.List;
@@ -16,7 +18,7 @@ import java.util.Map; @@ -16,7 +18,7 @@ import java.util.Map;
16 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; 18 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
17 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 19 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
18 20
19 -@Mapper 21 +@Mapper(uses = {AddressConvert.class})
20 public interface MemberUserConvert { 22 public interface MemberUserConvert {
21 23
22 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); 24 MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class);
@@ -31,6 +33,7 @@ public interface MemberUserConvert { @@ -31,6 +33,7 @@ public interface MemberUserConvert {
31 33
32 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page); 34 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page);
33 35
  36 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
34 MemberUserRespVO convert03(MemberUserDO bean); 37 MemberUserRespVO convert03(MemberUserDO bean);
35 38
36 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, 39 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,