From ebb599c6b04da1b6cefddc718c0727e5d7522f31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 六月 2024 10:06:07 +0800
Subject: [PATCH] 解决bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index e94b931..be3b6b2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -31,9 +31,10 @@
import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.domain.MemberLevel;
+import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
-import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.service.IMemberLevelService;
+import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.RemoteUserService;
@@ -42,22 +43,20 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberPoints;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.domain.dto.*;
-
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MobileDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
-
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -134,7 +133,7 @@
private RedisService redisService;
@Resource
- private IMemberLevelService iMemberLevelService;
+ private MemberLevelMapper memberLevelMapper;
@Resource
@@ -374,7 +373,7 @@
}
@Override
- public List<Member> getMemberListByIds(Set<Long> memberIdList) {
+ public List<Member> getMemberListByIds(Collection<Long> memberIdList) {
return this.listByIds(memberIdList);
}
@@ -527,8 +526,8 @@
}
}
this.updateById(byId);
-
- List<MemberLevel> list = iMemberLevelService.list();
+ LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
+ List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
for (int i=0;i<list.size();i++){
if (i==0){
int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
@@ -588,6 +587,25 @@
}
return PageDTO.of(page, MgtMemberPointsVO.class);
}
+
+ @Override
+ public List<Member> getMemberListByCondition(MemberDTO memberDTO) {
+ return this.lambdaQuery()
+ .like(StringUtils.isNotBlank(memberDTO.getNickname()), Member::getNickname,
+ memberDTO.getNickname())
+ .like(StringUtils.isNotBlank(memberDTO.getRealName()), Member::getRealName,
+ memberDTO.getRealName())
+ .like(StringUtils.isNotBlank(memberDTO.getPhone()), Member::getPhone,
+ memberDTO.getPhone()).list();
+ }
+
+ @Override
+ public List<Member> getMemberListByLevel(List<String> memberLevelList) {
+ return this.lambdaQuery()
+ .in(StringUtils.isNotEmpty(memberLevelList), Member::getLevel, memberLevelList)
+ .orderByDesc(Member::getLevel)
+ .list();
+ }
}
--
Gitblit v1.7.1