From 9a43e21c30a5d2db9c29f4ae23df9b39fc858a8a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 11:21:36 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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 ec42cb3..1dd509d 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
@@ -16,6 +16,7 @@
import com.doumee.dao.business.OrdersMapper;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.dao.business.model.Orders;
import com.doumee.dao.dto.WxPhoneRequest;
import com.doumee.dao.vo.AccountResponse;
@@ -106,7 +107,16 @@
@Override
public Member findById(Integer id) {
- return memberMapper.selectById(id);
+ Member member = memberMapper.selectById(id);
+ 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());
+ }
+ return member;
}
@Override
@@ -126,6 +136,7 @@
IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setDeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Member::getId, pageWrap.getModel().getId());
}
@@ -153,16 +164,16 @@
queryWrapper.lambda().eq(Member::getCoverImage, pageWrap.getModel().getCoverImage());
}
if (pageWrap.getModel().getOpenid() != null) {
- queryWrapper.lambda().eq(Member::getOpenid, pageWrap.getModel().getOpenid());
+ queryWrapper.lambda().like(Member::getOpenid, pageWrap.getModel().getOpenid());
}
if (pageWrap.getModel().getNickName() != null) {
- queryWrapper.lambda().eq(Member::getNickName, pageWrap.getModel().getNickName());
+ queryWrapper.lambda().like(Member::getNickName, pageWrap.getModel().getNickName());
}
if (pageWrap.getModel().getTelephone() != null) {
- queryWrapper.lambda().eq(Member::getTelephone, pageWrap.getModel().getTelephone());
+ queryWrapper.lambda().like(Member::getTelephone, pageWrap.getModel().getTelephone());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getWorkerIdentity() != null) {
queryWrapper.lambda().eq(Member::getWorkerIdentity, pageWrap.getModel().getWorkerIdentity());
@@ -210,6 +221,15 @@
if (pageWrap.getModel().getArea() != null) {
queryWrapper.lambda().eq(Member::getArea, pageWrap.getModel().getArea());
}
+ //濡傛灉鏌ヨ鎺ュ崟鏂�
+ queryWrapper.lambda().and(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.ONE ),w1->{
+ w1.eq(Member::getWorkerIdentity,Constants.TWO )
+ .or().eq(Member::getChefIdentity,Constants.TWO )
+ .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());
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3