From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 11 六月 2024 18:18:05 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 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 8a1c8ec..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
@@ -21,35 +21,42 @@
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.member.controller.management.dto.MgtMemberPointsQuery;
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
+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.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;
import com.ruoyi.system.api.constants.SecurityConstant;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
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;
@@ -126,7 +133,11 @@
private RedisService redisService;
@Resource
- private IMemberLevelService iMemberLevelService;
+ private MemberLevelMapper memberLevelMapper;
+
+
+ @Resource
+ private IMemberPointsService memberPointsService;
@Override
@@ -362,7 +373,7 @@
}
@Override
- public List<Member> getMemberListByIds(Set<Long> memberIdList) {
+ public List<Member> getMemberListByIds(Collection<Long> memberIdList) {
return this.listByIds(memberIdList);
}
@@ -515,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());
@@ -544,8 +555,58 @@
}
}
-}
+ /**
+ * 获取用户详情
+ *
+ * @param id 会员id
+ * @return MgtMemberVO
+ */
+ @Override
+ public MgtMemberVO getMemberById(Long id) {
+ Member member = this.getById(id);
+ if (StringUtils.isNull(member)) {
+ throw new ServiceException("会员不存在");
+ }
+ return BeanUtils.copyBean(member, MgtMemberVO.class);
+ }
+
+ /**
+ * 获取积分明细分页列表
+ *
+ * @param query 会员积分明细查询对象
+ * @return PageDTO<MgtMemberPointsVO>
+ */
+ @Override
+ public PageDTO<MgtMemberPointsVO> getMemberPoints(MgtMemberPointsQuery query) {
+ Page<MemberPoints> page = memberPointsService.lambdaQuery()
+ .eq(MemberPoints::getMemberId, query.getId())
+ .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ if (StringUtils.isEmpty(page.getRecords())) {
+ return PageDTO.empty(page);
+ }
+ 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