From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 2 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 aa8db91..ea14810 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
@@ -30,7 +30,9 @@
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.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;
@@ -43,13 +45,15 @@
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;
@@ -128,7 +132,13 @@
private RedisService redisService;
@Resource
+ private IMemberLevelService iMemberLevelService;
+
+
+ @Resource
private IMemberPointsService memberPointsService;
+
+
@Override
public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
@@ -362,7 +372,7 @@
}
@Override
- public List<Member> getMemberListByIds(Set<Long> memberIdList) {
+ public List<Member> getMemberListByIds(Collection<Long> memberIdList) {
return this.listByIds(memberIdList);
}
@@ -494,6 +504,57 @@
return PageDTO.of(page, MgtMemberVO.class);
}
+ @Override
+ public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
+ Member byId = this.getById(dMembeOneDTO.getMemberId());
+ if (dMembeOneDTO.getMoney()!=null){
+ if (dMembeOneDTO.getType()==1){
+ BigDecimal big=byId.getMoney().add(dMembeOneDTO.getMoney());
+ byId.setMoney(big);
+ }else {
+ BigDecimal big=byId.getMoney().subtract(dMembeOneDTO.getMoney());
+ byId.setMoney(big);
+ }
+ } if (dMembeOneDTO.getTotalPoints()!=null){
+ if (dMembeOneDTO.getType()==1){
+ Integer big=byId.getTotalPoints()+dMembeOneDTO.getTotalPoints();
+ byId.setTotalPoints(big);
+ }else {
+ Integer big=byId.getTotalPoints()-dMembeOneDTO.getTotalPoints();
+ byId.setTotalPoints(big);
+ }
+ }
+ this.updateById(byId);
+
+ List<MemberLevel> list = iMemberLevelService.list();
+ for (int i=0;i<list.size();i++){
+ if (i==0){
+ int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
+ if (ia<0){
+ byId.setLevel(0);
+ break;
+ }
+ }
+ if (i==list.size()-1){
+ BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
+ BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
+ if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
+ byId.setLevel(list.get(i).getLevel());
+ }else{
+ byId.setLevel(list.get(i).getLevel());
+ }
+ }else {
+ BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
+ BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
+ if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
+ byId.setLevel(list.get(i).getLevel());
+ }
+ }
+
+ }
+
+ }
+
/**
* 获取用户详情
*
@@ -525,6 +586,15 @@
}
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.getPhone()), Member::getPhone,
+ memberDTO.getPhone()).list();
+ }
}
--
Gitblit v1.7.1