From 3726375e0ae995404a76838f18bd5f40081a4412 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 06 十一月 2023 18:42:24 +0800
Subject: [PATCH] # 导出字段调整 登陆提示
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 d0051b2..9d4b804 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
@@ -114,6 +114,16 @@
@Override
public void update(Member member) {
+
+ QueryWrapper<Member> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getType,Constants.ONE)
+ .eq(Member::getCardNo,member.getCardNo());
+ Member member1 = memberMapper.selectOne(wrapper);
+ if (Objects.nonNull(member1) && member1.getId().equals(member.getId())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿瀛樺湪閲嶅");
+ }
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Member update = new Member();
update.setId(member.getId());
@@ -143,7 +153,7 @@
@Override
public Member findOne(Member member) {
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
- return memberMapper.selectOne(wrapper);
+ return memberMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -318,31 +328,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 +393,6 @@
userResponse.setMobile(member.getPhone());
return userResponse;
}
-
}
--
Gitblit v1.9.3