jiangqs
2023-05-09 3d6f2cd1483c5e85a3f2eeb2edd89c088d1d5c6b
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -142,7 +142,8 @@
                sysUser = new SysUser();
                sysUser.setUserName(memberId);
                sysUser.setUserType("03");
                sysUser.setNickName("微信用户");
                sysUser.setNickName("鸿瑞堂用户");
                sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                String password = "hongruitang";
                sysUser.setPassword(SecurityUtils.encryptPassword(password));
                sysUser = sysUserService.registerUser(sysUser).getData();
@@ -150,6 +151,8 @@
                member = new Member();
                member.setUserId(sysUser.getUserId());
                member.setDelFlag(0);
                member.setNickName("鸿瑞堂用户");
                member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                member.setMemberId(memberId);
                member.setWxUnionid(unionid);
                member.setMiniOpenid(openid);
@@ -237,7 +240,7 @@
        sysUser.setPhonenumber(mobile);
        sysUserService.updateUserMobile(sysUser);
        member.setMobile(mobile);
        member.setRealName(sysUser.getNickName());
        member.setNickName(sysUser.getNickName());
        this.saveOrUpdate(member);
        appUserAuthorizeVo.setMobile(mobile);
        appUserAuthorizeVo.setNickName(sysUser.getNickName());
@@ -308,7 +311,7 @@
        Member member = this.getByUserId(appEditUserDto.getUserId());
        switch (editType){
            case 1:
                member.setRealName(editValue);
                member.setNickName(editValue);
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
@@ -354,12 +357,12 @@
    @Override
    public MerMemberInfoVo getMerMemberInfo(Long userId){
        MerMemberInfoVo merMemberInfoVo = new MerMemberInfoVo();
        SysUser sysUser = sysUserService.getSysUser(userId).getData();
        Member member = this.getByUserId(userId);
        merMemberInfoVo.setUserId(userId);
        merMemberInfoVo.setNickName(sysUser.getNickName());
        merMemberInfoVo.setPhonenumber(sysUser.getPhonenumber());
        merMemberInfoVo.setAvatar(sysUser.getAvatar());
        merMemberInfoVo.setNickName(member.getNickName());
        merMemberInfoVo.setPhonenumber(member.getMobile());
        merMemberInfoVo.setAvatar(member.getAvatar());
        merMemberInfoVo.setBirthday(member.getBirthday());
        //未完成
        return merMemberInfoVo;
@@ -400,6 +403,9 @@
        MerMemberBasicFileVo merMemberBasicFileVo = new MerMemberBasicFileVo();
        Member member = this.getByUserId(userId);
        BeanUtils.copyProperties(member, merMemberBasicFileVo);
        merMemberBasicFileVo.setNickName(member.getNickName());
        merMemberBasicFileVo.setPhonenumber(member.getMobile());
        merMemberBasicFileVo.setCreateTime(member.getCreateTime());
        List<MemberNurse> memberNurseList = memberNurseService.listByUserId(userId);
        List<String> valueList = memberNurseList.stream().map(k->k.getNurse()).collect(Collectors.toList());
        merMemberBasicFileVo.setMemberNurse(valueList);