后台管理新增添加会员到家族的功能

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

@@ -143,7 +143,7 @@ public class AppMemberVo extends BaseEntity {
     private String parentName;
     @ApiModelProperty(value="父亲id")
     private Long parentId;
-    @ApiModelProperty(value="申请状态 1申请 2同意 3拒绝")
+    @ApiModelProperty(value="申请状态 1申请 2同意 3拒绝 4退出")
     private String status;
 
 

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

@@ -20,7 +20,7 @@ public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
     AppMemberVo get(Long memberId);
     List<AppMemberVo> selectMemberList(LambdaQueryWrapper wrapper);
     AppMemberVo getMemberDetail(Long familyId, Long memberId);
-    boolean saveOrUpdate(AppMemberVo memberVo);
+    AjaxResult saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> myMemberList(LambdaQueryWrapper<AppMemberVo> lqw);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);

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

@@ -54,13 +54,13 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
      * @return
      */
     @Override
-    public boolean saveOrUpdate(AppMemberVo memberVo){
+    public AjaxResult saveOrUpdate(AppMemberVo memberVo){
         if (memberVo.getUserId()!=null &&
                 memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
-            return false;
+            return AjaxResult.error("不能添加自己为配偶");
         }
         if (StringUtils.isBlank(memberVo.getMobile())){
-            return false;
+            return AjaxResult.error("手机号不能为空");
         }
         AppMemberVo member = userService.getMember("member",null,memberVo.getMobile());
         if (member == null) {
@@ -81,7 +81,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         // 昵称和姓名同步
         member.setNickName(member.getName());
         if(!userService.saveOrUpdate(member)){
-            return false;
+            return AjaxResult.error("保存失败");
         }
         TbMemberMiddle memberMiddle = memberMiddleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getFamilyId, member.getFamilyId())
@@ -101,7 +101,7 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             memberMiddle.setStatus(memberVo.getStatus());
             memberMiddleService.updateById(memberMiddle);
         }
-        return true;
+        return AjaxResult.success();
     }
 
     /**
@@ -378,41 +378,11 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
                 member.getParentId().equals(member.getSpouseUserId())) {
             return AjaxResult.error("父辈与配偶不能为同一人");
         }
-        // 昵称和姓名同步
-        member.setNickName(member.getName());
-        // 根据memberID获取
-        AppMemberVo memberVo1 = userService.getMember("member",member.getMemberId().toString(),null);
-        // 根据手机号获取
-        AppMemberVo memberVo2 = userService.getAppMember(null,member.getMobile());
-        if (memberVo1 == null) {
-            return AjaxResult.error("保存失败,成员信息为空");
-        }
-        if (memberVo2 != null){
-            // 手机号更改并且手机号已存在
-            if (!memberVo1.getMobile().equals(member.getMobile()) &&
-                    memberVo2.getMobile().equals(member.getMobile())) {
-                return AjaxResult.error("修改的手机号已存在");
-            }
-        }
-
         if (StringUtils.isNotBlank(member.getMemberRemark())) {
             member.setMemberRemark(member.getMemberRemark());
         }
 
-        TbMemberMiddle memberMiddle = memberMiddleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
-                .eq(TbMemberMiddle::getFamilyId, member.getFamilyId())
-                .eq(TbMemberMiddle::getMemberId, member.getMemberId())
-                .last("limit 1")
-        );
-        if (memberMiddle != null) {
-            memberMiddle.setStatus(member.getStatus());
-            memberMiddleService.updateById(memberMiddle);
-        }
-
-        if(!userService.saveOrUpdate(member)){
-            return AjaxResult.error("保存失败");
-        }
-        return AjaxResult.success("保存成功");
+        return saveOrUpdate(member);
     }
 
     @Override
@@ -431,22 +401,14 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
                 member.getParentId().equals(member.getSpouseUserId())) {
             return AjaxResult.error("父辈与配偶不能为同一人");
         }
-        member.setUserId(null);
-        member.setMemberId(null);
-        // 昵称和姓名同步
-        member.setNickName(member.getName());
-        // 根据手机号获取
-        AppMemberVo memberVo = userService.getAppMember(null,member.getMobile());
-        if (memberVo != null){
-            // 手机号更改并且手机号已存在
-            if (memberVo.getMobile().equals(member.getMobile())) {
-                return AjaxResult.error("手机号已存在");
-            }
-        }
-
-        if(saveOrUpdate(member)){
-            return AjaxResult.success("保存成功");
+        List<AppMemberVo> memberVos = this.myMemberList(new LambdaQueryWrapper<AppMemberVo>()
+                .eq(AppMemberVo::getFamilyId, member.getFamilyId())
+                .eq(AppMemberVo::getMobile, member.getMobile())
+                .eq(AppMemberVo::getStatus,"2")
+        );
+        if (memberVos.size() > 0) {
+            return AjaxResult.error("该成员已在本家族");
         }
-        return AjaxResult.error("保存失败");
+        return saveOrUpdate(member);
     }
 }