修改家族成员管理，修改通过/拒绝好友申请

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbAppUserController.java

@@ -51,16 +51,27 @@ public class TbAppUserController extends BaseController {
     private final ITbFamilyMemberService memberService;
 
     /**
+     * 查询会员分页列表
+     */
+    @ApiOperation("查询会员+家族成员分页列表")
+    @PreAuthorize("@ss.hasPermi('system:appUser:list')")
+    @GetMapping("/memberPage")
+    public TableDataInfo memberPage(AppMemberVo memberVo) {
+        startPage();
+        List<AppMemberVo> list = iTbAppUserService.selectAppMembers(memberVo.getEnable(),memberVo.getSearchValue(),
+                memberVo.getBeginTime(),memberVo.getEndTime());
+        return getDataTable(list);
+    }
+    /**
      * 查询会员列表
      */
     @ApiOperation("查询会员+家族成员列表")
     @PreAuthorize("@ss.hasPermi('system:appUser:list')")
     @GetMapping("/memberList")
-    public TableDataInfo memberList(AppMemberVo memberVo) {
-        startPage();
+    public AjaxResult memberList(AppMemberVo memberVo) {
         List<AppMemberVo> list = iTbAppUserService.selectAppMembers(memberVo.getEnable(),memberVo.getSearchValue(),
                 memberVo.getBeginTime(),memberVo.getEndTime());
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyMemberController.java

@@ -64,9 +64,10 @@ public class TbFamilyMemberController extends BaseController {
      */
     @ApiOperation("获取家族成员详细信息")
     @PreAuthorize("@ss.hasPermi('system:member:query')" )
-    @GetMapping(value = "/{id}" )
+    @GetMapping(value = "/get/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) String id) {
-        return AjaxResult.success(userService.getMember("member",id,null));
+        AppMemberVo memberVo = userService.getMember("member",id,null);
+        return AjaxResult.success(memberVo);
     }
 
     /**
@@ -77,6 +78,12 @@ public class TbFamilyMemberController extends BaseController {
     @Log(title = "家族成员" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody AppMemberVo memberVo) {
+        if (StringUtils.isBlank(memberVo.getMobile())){
+            return AjaxResult.error("手机号不能为空");
+        }
+        if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
+            return AjaxResult.error("配偶不能选自己");
+        }
         return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);
     }
 
@@ -88,6 +95,9 @@ public class TbFamilyMemberController extends BaseController {
     @Log(title = "家族成员" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody AppMemberVo memberVo) {
+        if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
+            return AjaxResult.error("配偶不能选自己");
+        }
         return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);
     }
 

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

@@ -146,10 +146,13 @@ public class MyFriendController extends AppBaseController {
     }
 
 
-    @ApiOperation("通过申请")
-    @ApiImplicitParam(name = "id", value = "好友id",paramType="Long")
+    @ApiOperation("通过/拒绝申请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "好友id",paramType="Long"),
+            @ApiImplicitParam(name = "status", value = "状态 1申请 2已通过 3未通过",paramType="String")
+    })
     @GetMapping("/pass")
-    public AjaxResult pass(Long id){
+    public AjaxResult pass(Long id, String status){
         if (id == null) {
             return AjaxResult.error("好友id不能为空");
         }
@@ -161,7 +164,9 @@ public class MyFriendController extends AppBaseController {
         if ("2".equals(friends.getStatus())) {
             return AjaxResult.error("好友已添加");
         }
-        friends.setStatus("2");
+        friends.setStatus(status);
+        friends.setUpdateBy(user.getUserId().toString());
+        friends.setUpdateTime(new Date());
         return toAjax(friendsService.updateById(friends) ? 1 : 0);
     }
 

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

@@ -47,7 +47,8 @@ public class TbFamilyMember implements Serializable {
     /** 配偶 */
     @ApiModelProperty(value="配偶 会员id")
     @Excel(name = "配偶")
-    private String spouseUserId;
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Long spouseUserId;
 
     /** 姓名 */
     @ApiModelProperty(value="姓名")

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

@@ -116,6 +116,9 @@ public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser
         member.setAppUserId(appUser.getId());
         // 新增成员
         if (memberVo.getMemberId() == null) {
+            member.setName(memberVo.getNickName());
+            member.setPyCode(CodeUtil.getFirstLetter(memberVo.getNickName()));
+            member.setPyFirst(CodeUtil.getOneLetter(memberVo.getNickName()));
             member.setCreateBy(memberVo.getUserCreateBy());
             member.setCreateTime(date);
             memberService.save(member);

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

@@ -9,6 +9,7 @@ import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbMemberMiddleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -52,10 +53,19 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
      */
     @Override
     public boolean saveOrUpdate(AppMemberVo memberVo){
+        if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
+            return false;
+        }
+        if (StringUtils.isBlank(memberVo.getMobile())){
+            return false;
+        }
+        AppMemberVo member = userService.getMember("member",null,memberVo.getMobile());
+        if (member != null) {
+            BeanUtils.copyBeanProp(member, memberVo);
+        }
         if(!userService.saveOrUpdate(memberVo)){
             return false;
         }
-
         TbMemberMiddle memberMiddle = memberMiddleService.getOne(new LambdaQueryWrapper<TbMemberMiddle>()
                 .eq(TbMemberMiddle::getFamilyId, memberVo.getFamilyId())
                 .eq(TbMemberMiddle::getMemberId, memberVo.getMemberId())

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

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND enable = #{enable}
             </if>
             <if test="search != null and search != '' ">
-                and ( a.nick_name LIKE CONCAT('%',#{search},'%') or mobile LIKE CONCAT('%',#{search},'%') or qrcode LIKE CONCAT('%',#{search},'%') )
+                and ( name LIKE CONCAT('%',#{search},'%') or a.nick_name LIKE CONCAT('%',#{search},'%') or mobile LIKE CONCAT('%',#{search},'%') or qrcode LIKE CONCAT('%',#{search},'%') )
             </if>
 
             <if test="type == 'user' ">

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

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectFamilyMember" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
-        select u.mobile,u.qrcode,u.nick_name, m.name,m.gender,m.birthday,m.spouse_user_id,mi.status,m.state,
+        select u.id user_id,m.id member_id,u.mobile,u.qrcode,u.nick_name, m.name,m.gender,m.birthday,m.spouse_user_id,mi.status,m.state,
         (select mm.name from tb_family_member mm where mm.app_user_id = m.spouse_user_id) spouse,
         mi.parent_id,(select me.name from tb_family_member me where mi.parent_id = me.id) parent_name,
         (select mm.name from tb_family_member mm where mm.app_user_id = (select me.spouse_user_id from tb_family_member me where mi.parent_id = me.id)) mother_name