添加获取家族成员详情接口

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -146,13 +146,16 @@ public class FamilyMemberController extends AppBaseController {
     }
 
 
-    @ApiOperation("获取成员")
+    @ApiOperation("获取家族成员详情")
     @PostMapping("/get")
-    public AjaxResult get(Long memberId) {
+    public AjaxResult get(Long familyId,Long memberId) {
+        if (familyId == null) {
+            return AjaxResult.error("家族id不能为空");
+        }
         if (memberId == null) {
             return AjaxResult.error("成员id不能为空");
         }
-        return AjaxResult.success(memberService.get(memberId));
+        return AjaxResult.success(memberService.getMemberDetail(familyId,memberId));
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppMemberVo.java

@@ -157,4 +157,10 @@ public class AppMemberVo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date userUpdateTime;
     private String userRemark;
+
+    @ApiModelProperty(value="是否管理员 Y是 N否")
+    private String admin;
+
+    @ApiModelProperty(value="是否族长  Y是  N否")
+    private String patriarch;
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyMemberService.java

@@ -17,6 +17,7 @@ import java.util.List;
 public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
 
     AppMemberVo get(Long memberId);
+    AppMemberVo getMemberDetail(Long familyId, Long memberId);
     boolean saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -136,9 +136,22 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         return AjaxResult.success();
     }
 
-    public AppMemberVo getMemberDetail(Long familyId) {
+    /**
+     * 获取家族成员的详细信息
+     * @param familyId
+     * @param memberId
+     * @return
+     */
+    @Override
+    public AppMemberVo getMemberDetail(Long familyId, Long memberId) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
-
+        List<AppMemberVo> memberVos = baseMapper.selectFamilyTree(new LambdaQueryWrapper<AppMemberVo>()
+                .eq(AppMemberVo::getFamilyId,familyId)
+                .eq(AppMemberVo::getMemberId,memberId)
+        );
+        if (memberVos.size() > 0) {
+            return memberVos.get(0);
+        }
         return null;
     }
     @Override

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyServiceImpl.java

@@ -74,6 +74,9 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
             middle = new TbMemberMiddle();
             middle.setFamilyId(memberVo.getFamilyId());
             middle.setMemberId(memberVo.getMemberId());
+
+            // 新成员名字与会员昵称同步
+            memberVo.setName(memberVo.getNickName());
         } else {
             if ("2".equals(middle.getStatus())){
                 return AjaxResult.error("已在该家族，不允许重复加入");