From 1941e9fc342b3a2cb6d32e9658ad46f29f50a5df Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 15:36:11 +0800
Subject: [PATCH] 代码提交

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 37739e1..efb2eb7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -275,7 +275,7 @@
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
             }
 //            String openId = code;
-            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+            Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId).isNotNull("phone"));
             Users users = new Users();
             if(StringUtils.isBlank(iamId)){
                 users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
@@ -306,18 +306,17 @@
                 this.saveCustomerUser(users,member.getId());
             }else{
                 ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
-                if(Objects.isNull(ztUserGetTokenResponse)){
-                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
-                }else{
+                if(!Objects.isNull(ztUserGetTokenResponse)){
                     member.setToken(ztUserGetTokenResponse.getToken());
+                    memberMapper.updateById(member);
                 }
                 this.saveCustomerUser(users,member.getId());
                 member = this.getMemberInfo(member.getId());
-
             }
             //鍒涘缓token
             JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
             String token = JwtTokenUtil.generateToken(payLoad);
+            redisTemplate.opsForValue().set(ZTConstants.CUSTOMER+"_"+member.getId(),token);
             AccountResponse accountResponse = new AccountResponse();
             accountResponse.setToken(token);
             accountResponse.setSessionKey(session.getSessionKey());
@@ -439,13 +438,11 @@
         ztUserInfoUpdateRequest.setHouseLayout(Constants.getHouseLayout(member.getHousetype()));
         ZTBaseResponse userUpdateInfo = zbomZhongTaiService.userUpdateInfo(ztUserInfoUpdateRequest);
         if(Objects.isNull(userUpdateInfo)||userUpdateInfo.getCode()!=200){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴淇℃伅鏇存柊澶辫触锛岃鑱旂郴绠$悊鍛�");
+            return null;
         }
         ZTUserGetTokenResponse ztUserGetTokenResponse = (ZTUserGetTokenResponse) userUpdateInfo.getData();
         return ztUserGetTokenResponse;
     }
-
-
 
     @Override
     public Member getMemberInfo(Long memberId){
@@ -538,8 +535,6 @@
     }
 
 
-
-
     @Override
     public ZTBaseRequst logOff(Long memberId){
         Member member = memberMapper.selectById(memberId);
@@ -547,7 +542,8 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
         if(StringUtils.isBlank(member.getPhone())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
+            redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
+           return null;
         }
         //鏍¢獙鐢ㄦ埛token淇℃伅
         MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
@@ -557,10 +553,12 @@
         ztBaseRequst.setOpenId(member.getOpenid());
         ztBaseRequst.setToken(member.getToken());
         memberMapper.update(new UpdateWrapper<Member>().lambda()
+                .set(Member::getOpenid,null)
                 .set(Member::getPhone,null)
                 .set(Member::getEditDate,new Date())
                 .eq(Member::getId,member.getId())
         );
+        redisTemplate.delete(ZTConstants.CUSTOMER+"_"+ member.getId());
         return ztBaseRequst;
     }
 

--
Gitblit v1.9.3