修改bug

mitao

2024-08-12 aeb379749ad10eabd54086e93231228a48c69843

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

@@ -54,6 +54,7 @@
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -75,6 +76,7 @@
 * @author mitao
 * @since 2024-05-16
 */
@Slf4j
@Service
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements IMemberService {

@@ -171,7 +173,7 @@
                    String user1= response.getOpenId();

                    LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
                    wrapper.eq(Member::getZfbOpenid,response.getOpenId());
                    wrapper.eq(Member::getPhone, appMiniLoginDto.getPhone());
                    Member member=this.getOne(wrapper);
                    SysUser sysUser = null;
                    if (member != null) {
@@ -180,6 +182,7 @@
                        appMiniLoginVo.setSysUser(sysUser);
                        appMiniLoginVo.setMemberid(member.getId());
                        Member byId = this.getById(member.getId());
                        byId.setZfbOpenid(response.getOpenId());
                        if (appMiniLoginDto.getPhone()!=null){
                            byId.setPhone(appMiniLoginDto.getPhone());
                            this.updateById(byId);
@@ -232,55 +235,51 @@
                sessionKey = session.getSessionKey();
                //获取用户
                LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
                wrapper.eq(Member::getMiniOpenid,session.getOpenid());
                wrapper.eq(Member::getPhone, appMiniLoginDto.getPhone());
                Member member=this.getOne(wrapper);
                SysUser sysUser = null;
                if (member != null) {
                    sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                }
                LambdaQueryWrapper<Member> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(Member::getMiniOpenid,openid);
                Member member1=this.getOne(wrapper1);

                if (member1==null){
                        //创建新用户
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setNickName("白金用户");
                        sysUser.setUserType("03");
                        sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.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());
                        member.setDelFlag(0);
                        member.setNickname("白酒用户");
                        member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        member.setWxUnionid(unionid);
                        member.setPhone(appMiniLoginDto.getPhone());
                        member.setMiniOpenid(openid);
                        this.save(member);
                    appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
                    appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVo.setSysUser(sysUser);
                    appMiniLoginVo.setMemberid(member.getId());
                    } else {
                    sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                    appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
                    appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVo.setSysUser(sysUser);
                    appMiniLoginVo.setMemberid(member.getId());
                    Member byId = this.getById(member.getId());
                    if (appMiniLoginDto.getPhone()!=null){
                    byId.setMiniOpenid(openid);
                    byId.setWxUnionid(unionid);
                    if (appMiniLoginDto.getPhone() != null) {
                        byId.setPhone(appMiniLoginDto.getPhone());
                        this.updateById(byId);
                    }

                } else {
                    // 创建新用户
                    String memberId = IdUtils.simpleUUID();
                    sysUser = new SysUser();
                    sysUser.setUserName(memberId);
                    sysUser.setNickName("白金用户");
                    sysUser.setUserType("03");
                    sysUser.setAvatar(
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.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());
                    member.setDelFlag(0);
                    member.setNickname("白酒用户");
                    member.setAvatar(
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                    member.setWxUnionid(unionid);
                    member.setPhone(appMiniLoginDto.getPhone());
                    member.setMiniOpenid(openid);
                    this.save(member);
                    appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
                    appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVo.setSysUser(sysUser);
                    appMiniLoginVo.setMemberid(member.getId());
                }
            }
        }
@@ -452,7 +451,7 @@
                Map<String, String> openapiResult1 = JSON.parseObject(plainData,
                        new TypeReference<Map<String, String>>() {
                        }, Feature.OrderedField);

                log.info("支付宝获取手机号返回值：{}", JSON.toJSONString(openapiResult1));
                mobile=openapiResult1.get("mobile");
            }
        }else{
@@ -473,6 +472,7 @@
            String responseUserPhoneNumber = null;
            try {
                responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
                log.info("微信获取手机号返回值：{}", JSON.toJSONString(responseUserPhoneNumber));
            } catch (Exception e) {
                throw new RuntimeException(e);
            }