From 391c0cfc4ba595ef26c7a2315c555d8c75afec7d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 八月 2025 11:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 6602688..b6f728c 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
@@ -2,6 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.config.wx.WxMiniConfig;
@@ -33,13 +34,16 @@
import nonapi.io.github.classgraph.json.Id;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Random;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -228,7 +232,7 @@
.or().eq(Member::getDriverIdentity,Constants.TWO );
});
queryWrapper.lambda().ge(pageWrap.getModel().getStartTime()!=null, Member::getCreateTime,pageWrap.getModel().getStartTime());
- queryWrapper.lambda().ne(pageWrap.getModel().getEndTime()!=null,Member::getCreateTime,pageWrap.getModel().getEndTime());
+ queryWrapper.lambda().le(pageWrap.getModel().getEndTime()!=null,Member::getCreateTime,pageWrap.getModel().getEndTime());
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -248,8 +252,6 @@
/***************灏忕▼搴忔帴鍙�*************/
-
-
/**
* 寰俊灏忕▼搴忕櫥褰�
@@ -324,7 +326,6 @@
member.setPublishNum(Constants.ZERO.longValue());
member.setAutoReceiveStatus(Constants.ONE);
member.setUseIdentity(Constants.ZERO);
- member.setOpenid(wxPhoneRequest.getOpenid());
memberMapper.insert(member);
}
AccountResponse accountResponse = new AccountResponse();
@@ -342,7 +343,10 @@
@Override
public void editMemberInfo(Member member){
if(Objects.isNull(member)
- || ( StringUtils.isBlank(member.getCoverImage()) || StringUtils.isBlank(member.getName()) || StringUtils.isBlank(member.getNickName()) || Objects.isNull(member.getAutoReceiveStatus()) )){
+ || ( StringUtils.isBlank(member.getCoverImage())
+ && StringUtils.isBlank(member.getName())
+ && StringUtils.isBlank(member.getNickName())
+ && Objects.isNull(member.getAutoReceiveStatus()) )){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
memberMapper.update(new UpdateWrapper<Member>().lambda()
@@ -381,6 +385,11 @@
Member member = this.findById(memberId);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(StringUtils.isNotBlank(member.getCoverImage())){
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.MEMBER_FILES).getCode();
+ member.setFullCoverImage(path + member.getCoverImage());
}
UserCenterVO userCenterVO = new UserCenterVO();
userCenterVO.setReleaseTaskTotal(Constants.ZERO);
@@ -422,6 +431,11 @@
return userCenterVO;
}
+ @Override
+ public void logOff(String token,Integer memberId){
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" openid = null ").eq(Member::getId,memberId));
+ jwtTokenUtil.logoutForH5(token);
+ }
--
Gitblit v1.9.3