From 356b6e4b0a11a6e44717dc9b92beaacc9c0c4b7a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 八月 2024 10:13:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 5c36b86..aeced8b 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
@@ -18,7 +18,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
import com.ruoyi.common.core.enums.GenderEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -38,7 +37,6 @@
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;
@@ -55,7 +53,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
@@ -67,6 +64,8 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* <p>
@@ -519,6 +518,7 @@
.like(StringUtils.isNotBlank(query.getRealName()), Member::getRealName,
query.getRealName())
.like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
+ .eq(StringUtils.isNotBlank(query.getLevel()), Member::getLevel, query.getLevel())
.orderByDesc(Member::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
if (StringUtils.isEmpty(page.getRecords())) {
@@ -528,6 +528,7 @@
}
@Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
Member byId = this.getById(dMembeOneDTO.getMemberId());
if (dMembeOneDTO.getMoney()!=null){
@@ -543,7 +544,7 @@
Integer big=byId.getTotalPoints()+dMembeOneDTO.getTotalPoints();
byId.setTotalPoints(big);
}else {
- Integer big=byId.getTotalPoints()-dMembeOneDTO.getTotalPoints();
+ Integer big = Math.max(byId.getTotalPoints() - dMembeOneDTO.getTotalPoints(), 0);
byId.setTotalPoints(big);
}
}
--
Gitblit v1.7.1