Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java

@@ -24,6 +24,7 @@
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
@@ -120,7 +121,7 @@


    @Override
    public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) {
    public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
        AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();

        if(appMiniLoginDto.getType()==1){
@@ -144,6 +145,7 @@
                }
                //刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段
                request.setRefreshToken(response.getAccessToken());

                //返回成功时 就将唯一标识返回
                if (response.isSuccess()) {
                    System.out.println("调用成功");
@@ -165,13 +167,16 @@
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setUserType("03");
                        sysUser.setNickName("白金用户");
                        sysUser.setPhonenumber(response.getOpenId());
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();

                        if (sysUser==null){
                            sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                        }

                        member = new Member();
                        member.setUserId(sysUser.getUserId());
@@ -205,7 +210,7 @@
                sessionKey = session.getSessionKey();
                //获取用户
                LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
                wrapper.eq(Member::getZfbOpenid,session.getOpenid());
                wrapper.eq(Member::getMiniOpenid,session.getOpenid());
                Member member=this.getOne(wrapper);
                SysUser sysUser = null;
                if (member != null) {
@@ -214,7 +219,7 @@

                LambdaQueryWrapper<Member> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(Member::getMiniOpenid,openid);
                Member member1=this.getOne(wrapper);
                Member member1=this.getOne(wrapper1);

                if (member1==null){

@@ -222,13 +227,14 @@
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setUserType("03");
                        sysUser.setNickName("白金用户");
                        sysUser.setPhonenumber(openid);
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();
                        if (sysUser==null){
                            sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                        }


                        member = new Member();
@@ -378,7 +384,6 @@
                    String memberId = IdUtils.simpleUUID();
                    sysUser = new SysUser();
                    sysUser.setUserName(memberId);
                    sysUser.setUserType("03");
                    sysUser.setNickName("白金用户");
                    sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
                    sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -417,7 +422,6 @@
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setUserType("03");
                        sysUser.setNickName("白金用户");
                        sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");