APP：添加删除成员，编辑成员

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

@@ -15,6 +15,7 @@ import com.ruoyi.app.service.ITbFamilyService;
 import com.ruoyi.app.service.ITbMemberMiddleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -119,6 +120,55 @@ public class FamilyMemberController extends AppBaseController {
         return AjaxResult.success("添加成功");
     }
 
-    //TODO 逻辑删除家族树的成员（去掉parentId）；如果这一代只有他一个，则不允许删除，否则家族树会断开
+    @ApiOperation(value = "逻辑删除家族树的成员", notes = "逻辑删除家族树的成员（去掉parentId）；如果这一代只有他一个，则不允许删除，否则家族树会断开")
+    @PostMapping("/delToTree")
+    public AjaxResult delToTree(Long memberId, Long familyId) {
+        if (memberId == null || familyId ==null) {
+            return AjaxResult.error("参数不能为空");
+        }
+        TbMemberMiddle middle = middleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
+                .eq(TbMemberMiddle::getFamilyId,familyId)
+                .eq(TbMemberMiddle::getMemberId,memberId)
+                .last("limit 1")
+        );
+        if (middle == null) {
+            return AjaxResult.error("删除失败");
+        }
+        if (middle.getParentId() == null) {
+            return AjaxResult.error("该成员没有在家族树中");
+        }
+        List<TbMemberMiddle> middleList = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
+                .eq(TbMemberMiddle::getParentId, middle.getParentId())
+        );
+        if (middleList.size() == 1) {
+            return AjaxResult.error("这一代只有一位成员，不允许删除");
+        }
+        // 设置parentId为空
+        middle.setParentId(null);
+        if(!middleService.updateById(middle)){
+            return AjaxResult.error("删除失败");
+        }
+        return AjaxResult.success("删除成功");
+    }
 
+    @ApiOperation("编辑成员")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody AppMemberVo member) {
+        if (member == null) {
+            return AjaxResult.error("成员信息不能为空");
+        }
+        if (StringUtils.isBlank(member.getMobile())){
+            return AjaxResult.error("手机号不能为空");
+        }
+        AppMemberVo memberVo = appUserService.getAppMember(null,member.getMobile());
+        if (memberVo == null) {
+            return AjaxResult.error("保存失败,成员信息不能为空");
+        }
+        // TODO copy后，id不知道还有没有
+        BeanUtils.copyBeanProp(memberVo,member);
+        if(!appUserService.saveOrUpdate(memberVo)){
+            return AjaxResult.error("保存失败");
+        }
+        return AjaxResult.success("保存成功");
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMemberMiddle.java

@@ -86,9 +86,17 @@ public class TbMemberMiddle implements Serializable {
     @TableField(exist = false)
     private String nickName;
 
-    @ApiModelProperty(value="配偶")
+    @ApiModelProperty(value="配偶 会员id")
     @TableField(exist = false)
-    private String spouse;
+    private Long spouseUserId;
+
+    @ApiModelProperty(value="手机号")
+    @TableField(exist = false)
+    private String mobile;
+
+    @ApiModelProperty(value="性别编号")
+    @TableField(exist = false)
+    private String gender;
 
     @TableField(exist = false)
     private List<TbMemberMiddle> child;

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

@@ -96,7 +96,7 @@ public class AppMemberVo extends BaseEntity {
     /** 配偶 */
     @ApiModelProperty(value="配偶 会员id")
     @Excel(name = "配偶")
-    private String spouseUserId;
+    private Long spouseUserId;
 
     /** 姓名 */
     @ApiModelProperty(value="姓名")

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbMyFriendsMapper.java

@@ -21,6 +21,6 @@ public interface TbMyFriendsMapper extends BaseMapper<TbMyFriends> {
 //    List<TbMyFriends> listFriends(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyFriends> friendsLambdaQueryWrapper);
 
 
-    List<TbMyFriends> listFriends(@Param("id") Long uid, @Param("status") String status, @Param("nickName") String nickName);
+    List<TbMyFriends> listFriends(@Param("id") Long uid, @Param("status") String status, @Param("search") String search);
 
 }

ruoyi-system/src/main/resources/mapper/app/TbAppUserMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="sqlAppMember">
         select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,a.deleted,a.enable,a.login_time,a.login_ip,
-        a.py_code user_py_code,a.py_first user_,py_first
+        a.py_code user_py_code,a.py_first user_py_first,
         a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark
         ,
         b.id member_id,b.spouse_user_id,b.name,b.birthday,b.gender,b.education,b.state,b.py_code member_py_code,b.py_first member_py_first,