From fd7b8fb7c89832c28a838b0449bbb8a392433ee2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 14:33:02 +0800
Subject: [PATCH] 将华为云短信替换成阿里云短信
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index 49d0e31..d57ea7d 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.account.vo.UserPointDetailVO;
import com.ruoyi.account.vo.UserPointStatistics;
import com.ruoyi.account.vo.UserPointVO;
+import com.ruoyi.account.vo.UserStatisticsDetail;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.PhoneNumberValidator;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -23,6 +24,7 @@
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.enums.PointChangeType;
+import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -33,9 +35,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -111,11 +111,7 @@
AppUser appUser = appUserService.getById(userPointDetailVO.getTransferUserId());
userPointDetailVO.setName(appUser.getName());
}
- Integer historicalPoint = userPointDetailVO.getHistoricalPoint();
- Integer balance = userPointDetailVO.getBalance();
- if (historicalPoint != null && balance != null) {
- userPointDetailVO.setFlag(historicalPoint > balance ? 2 : 1);
- }
+ userPointDetailVO.setFlag(userPointDetailVO.getChangeDirection() == -1 ? 2 : 1);
}
pageInfo.setRecords(userPointDetail);
@@ -173,12 +169,11 @@
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(12);
- userPoint.setHistoricalPoint(lavePoint1);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUserForPhoe.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUserForPhoe.getId());
userPoint.setObjectId(userid);
+ userPoint.setChangeDirection(1);
userPointService.save(userPoint);
}
@@ -191,12 +186,11 @@
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(appUserForPhoe.getId());
+ userPoint.setChangeDirection(-1);
userPointService.save(userPoint);
}
return R.ok();
@@ -208,12 +202,7 @@
List<UserPoint> userPointList = this.baseMapper.selectUserPoint(userPoint);
userPointList.forEach(item -> {
- int i = item.getHistoricalPoint() - item.getBalance();
- if (i>0){
- item.setVariablePoint(item.getVariablePoint() * -1);
- }else {
- item.setVariablePoint(item.getVariablePoint());
- }
+ item.setVariablePoint(item.getVariablePoint() * item.getChangeDirection());
});
Map<Integer, Integer> userBalanceMap = userPointList.stream()
@@ -227,7 +216,7 @@
int pullNewPoint = userBalanceMap.getOrDefault(PointChangeType.PULL_NEW.getCode(), 0);
int registerPoint = userBalanceMap.getOrDefault(PointChangeType.REGISTER.getCode(), 0);
- // 做工积分：签到积分 + 每日分享积分 + 每日签到积分 + 每日使用时长积分
+ // 做工积分：每日分享积分 + 每日签到积分 + 每日使用时长积分
int share = userBalanceMap.getOrDefault(PointChangeType.SHARE.getCode(), 0);
int signIn = userBalanceMap.getOrDefault(PointChangeType.SIGN_IN.getCode(), 0);
int useTime = userBalanceMap.getOrDefault(PointChangeType.USE_TIME.getCode(), 0);
@@ -252,12 +241,7 @@
public IPage<UserPoint> getUserPointPage(Page<UserPoint> page, UserPoint userPoint) {
IPage<UserPoint> userPointIPage = this.baseMapper.queryUserPointPage(page, userPoint);
userPointIPage.getRecords().forEach(item -> {
- int i = item.getHistoricalPoint() - item.getBalance();
- if (i>0){
- item.setVariablePoint(item.getVariablePoint() * -1);
- }else {
- item.setVariablePoint(item.getVariablePoint());
- }
+ item.setVariablePoint(item.getVariablePoint() * item.getChangeDirection());
});
return userPointIPage;
}
--
Gitblit v1.7.1