From 977ddf38af1431de5a7121df974ff3d7a29932e4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 18:27:26 +0800
Subject: [PATCH] 代码提交

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 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 941c288..4d3cbf2 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
@@ -277,14 +277,14 @@
 
     @Override
     public AccountResponse wxLogin(String code){
-//        try {
-            //鑾峰彇寰俊鏁忔劅鏁版嵁
-//            WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
-//            String openId = session.getOpenid();
-//            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
-//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
-//            }
-            String openId = code;
+        try {
+//            鑾峰彇寰俊鏁忔劅鏁版嵁
+            WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
+            String openId = session.getOpenid();
+            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
+            }
+//            String openId = code;
             Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
             if (member == null) {
                 member = new Member();
@@ -316,13 +316,13 @@
             String token = JwtTokenUtil.generateToken(payLoad);
             AccountResponse accountResponse = new AccountResponse();
             accountResponse.setToken(token);
-//            accountResponse.setSessionKey(session.getSessionKey());
+            accountResponse.setSessionKey(session.getSessionKey());
             accountResponse.setMember(member);
             return accountResponse;
-//        } catch (WxErrorException e) {
-//            e.printStackTrace();
-//        }
-//        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
     }
 
     @Override
@@ -505,7 +505,7 @@
 
 
     @Override
-    public void logOff(Long memberId){
+    public ZTBaseRequst logOff(Long memberId){
         Member member = memberMapper.selectById(memberId);
         if(Objects.isNull(member)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -520,16 +520,12 @@
         ztBaseRequst.setUserType(Constants.CUSTOMER);
         ztBaseRequst.setOpenId(member.getOpenid());
         ztBaseRequst.setToken(member.getToken());
-        Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
-        if(logoutFlag){
-            memberMapper.update(new UpdateWrapper<Member>().lambda()
-                    .set(Member::getPhone,null)
-                    .set(Member::getEditDate,new Date())
-                    .eq(Member::getId,member.getId())
-            );
-            return;
-        }
-        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴娉ㄩ攢澶辫触锛岃鑱旂郴绠$悊鍛�");
+        memberMapper.update(new UpdateWrapper<Member>().lambda()
+                .set(Member::getPhone,null)
+                .set(Member::getEditDate,new Date())
+                .eq(Member::getId,member.getId())
+        );
+        return ztBaseRequst;
     }
 
 

--
Gitblit v1.9.3