From e1c75b31182dc3b627876cc498707ef8472e20a5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 十月 2023 11:12:39 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index cfbb756..ea705f5 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -318,31 +318,29 @@
             if(Objects.isNull(member)){
                 //鏂板鐢ㄦ埛 闇�瑕佽繘琛岀敤鎴风粦瀹氭墜鏈哄彿
                 member = new Member();
+                member.setId(Constants.getUUID());
                 member.setCreateDate(new Date());
                 member.setIsdeleted(Constants.ZERO);
                 member.setOpenid(openId);
                 member.setUnionid(unionId);
                 member.setType(Constants.ZERO);
+                member.setRegisterDate(new Date());
                 member.setOrigin(Constants.ZERO.toString());
                 member.setStatus(Constants.ZERO);
                 memberMapper.insert(member);
-                accountResponse.setStatus(Constants.ONE);
-            }else{
-                UserResponse userResponse = getUserInfo(member.getId());
-                if(StringUtils.isBlank(member.getPhone())){
-                    accountResponse.setStatus(Constants.ONE);
-                }else{
-                    JwtPayLoad payLoad = new JwtPayLoad(userResponse.getId());
-                    accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
-                }
-                accountResponse.setUserResponse(userResponse);
             }
-
+            UserResponse userResponse = getUserInfo(member.getId());
+            if(StringUtils.isBlank(member.getPhone())){
+                accountResponse.setStatus(Constants.ONE);
+            }
+            JwtPayLoad payLoad = new JwtPayLoad(member.getId());
+            accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
+            accountResponse.setSessionKey(session.getSessionKey());
+            accountResponse.setUserResponse(userResponse);
             return accountResponse;
         } catch (WxErrorException e) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
         }
-
     }
 
 

--
Gitblit v1.9.3