jiangqs
2023-05-12 5f159dab33dce77f05472b16045ab6ca4f48d07b
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -147,18 +147,20 @@
                String password = "hongruitang";
                sysUser.setPassword(SecurityUtils.encryptPassword(password));
                sysUser = sysUserService.registerUser(sysUser).getData();
                log.info("sysUser1"+sysUser.toString());
                log.info("sysUser1-----------------"+sysUser.toString());
                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.setRelationShopId(1L);
                member.setWxUnionid(unionid);
                member.setMiniOpenid(openid);
                member.setBindingFlag(0);
                member.setCreateTime(new Date());
                this.save(member);
                log.info("member-----------------"+member.toString());
                this.saveOrUpdate(member);
            }else{
                log.info("member2"+member.toString());
@@ -234,16 +236,23 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        //更新用户手机信息
        SysUser sysUser = new SysUser();
        sysUser.setUserId(appUserAuthorizeDto.getUserId());
        sysUser.setPhonenumber(mobile);
        sysUserService.updateUserMobile(sysUser);
        SysUser sysUser1 = sysUserService.getSysUserBYmobile(mobile).getData();
        if(sysUser1!=null){
            member.setUserId(sysUser1.getUserId());
            member.setNickName(sysUser1.getNickName());
        }else{
            //更新用户手机信息
            SysUser sysUser = new SysUser();
            sysUser.setUserId(appUserAuthorizeDto.getUserId());
            sysUser.setPhonenumber(mobile);
            sysUserService.updateUserMobile(sysUser);
            member.setNickName(sysUser.getNickName());
        }
        member.setMobile(mobile);
        member.setNickName(sysUser.getNickName());
        this.saveOrUpdate(member);
        appUserAuthorizeVo.setMobile(mobile);
        appUserAuthorizeVo.setNickName(sysUser.getNickName());
        appUserAuthorizeVo.setNickName(member.getNickName());
        appUserAuthorizeVo.setOpenid(member.getMiniOpenid());
        appUserAuthorizeVo.setUnionid(member.getWxUnionid());
        return appUserAuthorizeVo;
@@ -279,20 +288,20 @@
    @Override
    public AppUserInfoVo getAppUserInfo(Long userId){
        AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
        SysUser sysUser = sysUserService.getSysUser(userId).getData();
        Member member = this.getByUserId(userId);
        appUserInfoVo.setUserId(userId);
        appUserInfoVo.setRelationShopId(member.getRelationShopId());
        appUserInfoVo.setMemberNo(member.getMemberNo());
        appUserInfoVo.setNickName(sysUser.getNickName());
        appUserInfoVo.setPhonenumber(sysUser.getPhonenumber());
        appUserInfoVo.setNickName(member.getNickName());
        appUserInfoVo.setRealName(member.getRealName());
        appUserInfoVo.setPhonenumber(member.getMobile());
        if(member.getRelationShopId()!=null){
            Shop shop = shopService.getShop(member.getRelationShopId()).getData();
            appUserInfoVo.setShopName(shop.getShopName());
        }
        appUserInfoVo.setBirthday(member.getBirthday());
        appUserInfoVo.setGender(member.getGender());
        appUserInfoVo.setAvatar(sysUser.getAvatar());
        appUserInfoVo.setAvatar(member.getAvatar());
        AppOrderTotalVo appOrderTotalVo = orderService.getAppOrderTotal(userId).getData();
        appUserInfoVo.setNoPayCount(appOrderTotalVo.getNoPayCount());
        appUserInfoVo.setNoUseCount(appOrderTotalVo.getNoUseCount());