From e685b58fd40cf28a20844643d70cc5f5b46ca037 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 四月 2026 11:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 127 +++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 50 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 16cb9e2..33dc998 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
@@ -69,6 +69,10 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private RedisTemplate<String,Object> redisTemplate;
+
+
@Override
public Integer create(Member member) {
memberMapper.insert(member);
@@ -271,13 +275,18 @@
if (StringUtils.isBlank(openId)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("openid", openId).eq("DELETED", Constants.ZERO).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenid, openId).eq(Member::getUserType,Constants.ZERO)
+ .eq(Member::getDeleted, Constants.ZERO).ne(Member::getStatus, Constants.TWO).last("limit 1"));
AccountResponse accountResponse = new AccountResponse();
accountResponse.setOpenid(openId);
if(Objects.isNull(member)){
return accountResponse;
}
- accountResponse.setToken(jwtTokenUtil.generateToken(member));
+ if(!Constants.equalsInteger(member.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璐﹀彿宸茬鐢紝璇疯仈绯荤鐞嗗憳!");
+ }
+ String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
+ accountResponse.setToken(token);
accountResponse.setMember(member);
return accountResponse;
} catch (WxErrorException e) {
@@ -301,8 +310,12 @@
if(Objects.isNull(mobile)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,mobile).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,mobile).eq(Member::getUserType,Constants.ZERO)
+ .ne(Member::getStatus, Constants.TWO).last("limit 1"));
if(Objects.nonNull(member)){
+ if(!Constants.equalsInteger(member.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝璐﹀彿宸茬鐢紝璇疯仈绯荤鐞嗗憳!");
+ }
memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getTelephone,mobile)
.set(Member::getOpenid,wxPhoneRequest.getOpenid()).set(Member::getUpdateTime,new Date()).eq(Member::getId,member.getId()));
}else{
@@ -328,8 +341,9 @@
member.setUseIdentity(Constants.ZERO);
memberMapper.insert(member);
}
+ String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
AccountResponse accountResponse = new AccountResponse();
- accountResponse.setToken(jwtTokenUtil.generateToken(member));
+ accountResponse.setToken(token);
accountResponse.setMember(member);
return accountResponse;
} catch (Exception e) {
@@ -359,25 +373,25 @@
}
- @Override
- public void editUseIdentity(Member member){
- if(Objects.isNull(member)
- || Objects.isNull(member.getUseIdentity())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- if(Constants.equalsInteger(member.getUseIdentity(),Constants.ZERO)){
- member.setUseIdentity(Constants.ZERO);
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ZERO).eq(Member::getId,member.getId()));
- }else{
- if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getDeleted,Constants.ZERO)
- .eq(IdentityInfo::getMemberId,member.getId())
- .eq(IdentityInfo::getAuditStatus,Constants.TWO))>Constants.ZERO){
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ONE).eq(Member::getId,member.getId()));
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鏃犲彲鐢ㄦ帴鍗曡韩浠�!");
- }
- }
- }
+// @Override
+// public void editUseIdentity(Member member){
+// if(Objects.isNull(member)
+// || Objects.isNull(member.getUseIdentity())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }
+// if(Constants.equalsInteger(member.getUseIdentity(),Constants.ZERO)){
+// member.setUseIdentity(Constants.ZERO);
+// memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ZERO).eq(Member::getId,member.getId()));
+// }else{
+// if(identityInfoMapper.selectCount(new QueryWrapper<IdentityInfo>().lambda().eq(IdentityInfo::getDeleted,Constants.ZERO)
+// .eq(IdentityInfo::getMemberId,member.getId())
+// .eq(IdentityInfo::getAuditStatus,Constants.TWO))>Constants.ZERO){
+// memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getUseIdentity,Constants.ONE).eq(Member::getId,member.getId()));
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鏃犲彲鐢ㄦ帴鍗曡韩浠�!");
+// }
+// }
+// }
@Override
@@ -391,29 +405,29 @@
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
member.setFullCoverImage(path + member.getCoverImage());
}
- UserCenterVO userCenterVO = new UserCenterVO();
- userCenterVO.setReleaseTaskTotal(Constants.ZERO);
- userCenterVO.setWaitReceiveTotal(Constants.ZERO);
- userCenterVO.setDoingTotal(Constants.ZERO);
- userCenterVO.setWaitCommentTotal(Constants.ZERO);
- userCenterVO.setTaskingTotal(Constants.ZERO);
- userCenterVO.setDoneTotal(Constants.ZERO);
- userCenterVO.setReceiveTotal(Constants.ZERO);
- List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
- .eq(Orders::getReleaseMemberId,member.getId()));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(releaseOrders)){
- userCenterVO.setReleaseTaskTotal(releaseOrders.size());
- userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
- userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
- userCenterVO.setWaitReceiveTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.wait.getKey())).collect(Collectors.toList()).size());
- }
- List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member.getId()));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(acceptOrders)){
- userCenterVO.setReceiveTotal(acceptOrders.size());
- userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
- userCenterVO.setDoneTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())).collect(Collectors.toList()).size());
- }
- member.setUserCenterVO(userCenterVO);
+// UserCenterVO userCenterVO = new UserCenterVO();
+// userCenterVO.setReleaseTaskTotal(Constants.ZERO);
+// userCenterVO.setWaitReceiveTotal(Constants.ZERO);
+// userCenterVO.setDoingTotal(Constants.ZERO);
+// userCenterVO.setWaitCommentTotal(Constants.ZERO);
+// userCenterVO.setTaskingTotal(Constants.ZERO);
+// userCenterVO.setDoneTotal(Constants.ZERO);
+// userCenterVO.setReceiveTotal(Constants.ZERO);
+// List<Orders> releaseOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
+// .eq(Orders::getReleaseMemberId,member.getId()));
+// if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(releaseOrders)){
+// userCenterVO.setReleaseTaskTotal(releaseOrders.size());
+// userCenterVO.setWaitCommentTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())&&Constants.equalsInteger(i.getCommentStatus(),Constants.ZERO)).collect(Collectors.toList()).size());
+// userCenterVO.setDoingTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
+// userCenterVO.setWaitReceiveTotal(releaseOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.wait.getKey())).collect(Collectors.toList()).size());
+// }
+// List<Orders> acceptOrders = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO).eq(Orders::getAcceptMemberId,member.getId()));
+// if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(acceptOrders)){
+// userCenterVO.setReceiveTotal(acceptOrders.size());
+// userCenterVO.setTaskingTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.doing.getKey())).collect(Collectors.toList()).size());
+// userCenterVO.setDoneTotal(acceptOrders.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ordersStatus.done.getKey())).collect(Collectors.toList()).size());
+// }
+// member.setUserCenterVO(userCenterVO);
return member;
}
@@ -424,20 +438,33 @@
public UserCenterVO getPlatformAboutUs(){
UserCenterVO userCenterVO = new UserCenterVO();
userCenterVO.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
- userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
- userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
- userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
userCenterVO.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
userCenterVO.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
+
+// userCenterVO.setFeeStandards(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FEE_STANDARDS).getCode()));
+// userCenterVO.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
+// userCenterVO.setServerPhone(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_PHONE).getCode()));
return userCenterVO;
}
@Override
- public void logOff(String token,Integer memberId){
+ public void logOut(String token,Integer memberId){
memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" openid = null ").eq(Member::getId,memberId));
jwtTokenUtil.logoutForH5(token);
}
+ @Override
+ public void logOff(String token,Integer memberId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.nonNull(member)){
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+// .set(Member::getOpenId,null)
+ .set(Member::getStatus,Constants.TWO)
+ .eq(Member::getId,member.getId())
+ );
+ }
+ redisTemplate.delete(token);
+ }
}
--
Gitblit v1.9.3