From d06c577a634528b11bc4b83c2769f48992913cad Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 30 十月 2023 09:07:30 +0800 Subject: [PATCH] 修复bug --- server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 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 7c5d6f4..82d12ad 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 @@ -79,13 +79,13 @@ insert.setEditor(principal.getId()); insert.setIsdeleted(Constants.ZERO); insert.setName(member.getName()); - insert.setName(member.getNickname()); - insert.setStatus(Constants.ZERO); + insert.setNickname(member.getNickname()); + insert.setStatus(member.getStatus()); insert.setRegisterDate(new Date()); insert.setCardNo(member.getCardNo()); insert.setType(Constants.ONE); - memberMapper.insert(member); - return member.getId(); + memberMapper.insert(insert); + return insert.getId(); } @Override @@ -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(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�"); } - } @@ -385,7 +383,6 @@ userResponse.setMobile(member.getPhone()); return userResponse; } - } -- Gitblit v1.9.3