From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 135 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 36 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 2aff81d..2f1c2e9 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
@@ -7,16 +7,19 @@
import com.ruoyi.account.api.model.*;
import com.ruoyi.account.mapper.UserPointMapper;
import com.ruoyi.account.service.*;
-import com.ruoyi.account.vo.UserPointDetailVO;
-import com.ruoyi.account.vo.UserPointStatistics;
-import com.ruoyi.account.vo.UserPointVO;
+import com.ruoyi.account.vo.*;
+import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.PhoneNumberValidator;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.enums.PointChangeType;
+import com.ruoyi.system.api.domain.SysConfig;
+import com.ruoyi.system.api.feignClient.SysConfigClient;
import com.ruoyi.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,26 +45,33 @@
private TokenService tokenService;
@Resource
private UserPointService userPointService;
-
-
-
+ @Resource
+ private SysConfigClient sysConfigClient;
+ @Autowired
+ private UserPointMapper userPointMapper;
@Override
public UserPointVO getUserPoint(Long userId) {
AppUser appUser = appUserService.getById(userId);
- int totalPoint = 0;
- int sharePoint = 0;
- int shopAchievementPoint = 0;
- int shopSharePoint = 0;
UserPointVO userPointVO = new UserPointVO();
- userPointVO.setTotalPoint(appUser.getTotalPoint() + totalPoint);
+ userPointVO.setTotalPoint(appUser.getTotalPoint() );
userPointVO.setConsumePoint(appUser.getAvailablePoint());
- userPointVO.setShopPoint(appUser.getShopPoint());
- userPointVO.setSharePoint(appUser.getSharePoint() + sharePoint);
- userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
- userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint() + shopAchievementPoint);
- userPointVO.setShopSharePoint(appUser.getShopSharePoint() + shopSharePoint);
+ userPointVO.setRechargePoint(appUser.getRechargePoint());
+ userPointVO.setCancelPoint(appUser.getCancelPoint());
+ userPointVO.setExpendPoint(appUser.getExchangePoint());
+ userPointVO.setTransferableInPoint(appUser.getTransferableInPoint());
+ userPointVO.setTransferableOutPoint(appUser.getTransferableOutPoint());
+ R<SysConfig> info = sysConfigClient.getInfo(9L);
+ if (info == null || info.getData() == null) {
+ throw new RuntimeException("获取积分兑换比例配置失败");
+ }
+ String configValue = info.getData().getConfigValue();
+ if (StringUtils.isBlank(configValue)) {
+ throw new RuntimeException("积分兑换比例配置值为空");
+ }
+ Boolean isTransferable = Boolean.valueOf(configValue.trim());
+ userPointVO.setIsTransferable(isTransferable);
return userPointVO;
}
@@ -74,12 +84,16 @@
for (UserPointDetailVO userPointDetailVO : userPointDetail) {
Integer type1 = userPointDetailVO.getType();
if (type1 != null && type1.equals(12)){
- AppUser appUser = appUserService.getById(userPointDetailVO.getReceiveUserId());
+ //他人赠送
+ AppUser appUser = appUserService.getById(userPointDetailVO.getObjectId());
userPointDetailVO.setName(appUser.getName());
+ userPointDetailVO.setTransferUserId(appUser.getId());
}
if (type1 != null && type1.equals(13)){
- AppUser appUser = appUserService.getById(userPointDetailVO.getTransferUserId());
+ //赠予他人
+ AppUser appUser = appUserService.getById(userPointDetailVO.getObjectId());
userPointDetailVO.setName(appUser.getName());
+ userPointDetailVO.setReceiveUserId(appUser.getId());
}
Integer historicalPoint = userPointDetailVO.getHistoricalPoint();
Integer balance = userPointDetailVO.getBalance();
@@ -107,10 +121,8 @@
if (appUser == null) {
return R.fail("用户未找到");
}
- // 可转赠积分总数
- Integer transferablePoint = appUser.getTransferablePoint();
- if (point > transferablePoint) {
- return R.fail("可转赠积分不足");
+ if (appUser.getAvailablePoint() < point) {
+ return R.fail("用户可用积分不足");
}
AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
@@ -124,38 +136,65 @@
if(appUserForPhoe.getId().equals(userid)){
return R.fail("不能转增给自己");
}
- Integer lavePoint1 = appUserForPhoe.getLavePoint();
- appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point);
- appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);
- appUserForPhoe.setTransferablePoint(transferablePoint + point);
- appUserForPhoe.setAvailablePoint(appUserForPhoe.getAvailablePoint() + point);
- appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);
+
+ if (null==appUserForPhoe.getTotalPoint()){
+ appUserForPhoe.setTotalPoint(0);
+ }
+ if (null==appUserForPhoe.getTransferableInPoint()){
+ appUserForPhoe.setTransferableInPoint(0);
+ }
+ if(null==appUserForPhoe.getAvailablePoint()){
+ appUserForPhoe.setAvailablePoint(0);
+ }
+
+ Integer historicalPoint = appUserForPhoe.getAvailablePoint();//历史积分
+ Integer balance = historicalPoint +point;//变动后积分
+
+ appUserForPhoe.setAvailablePoint(balance);//可用积分增加
+
+ appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);//总积分增加
+ appUserForPhoe.setTransferableInPoint(appUserForPhoe.getTransferableInPoint() + point);//转入积分增加
+
appUserService.updateById(appUserForPhoe);
//构建积分流水记录
if(point > 0){
+ //转入用户
UserPoint userPoint = new UserPoint();
userPoint.setType(12);
- userPoint.setHistoricalPoint(lavePoint1);
+ userPoint.setHistoricalPoint(historicalPoint);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUserForPhoe.getLavePoint());
+ userPoint.setBalance(balance);
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUserForPhoe.getId());
userPoint.setObjectId(userid);
userPointService.save(userPoint);
}
- Integer lavePoint = appUser.getLavePoint();
- appUser.setLavePoint(appUser.getLavePoint() - point);
- appUser.setTransferablePoint(appUser.getTransferablePoint() - point);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
+ if (null==appUser.getTotalPoint()){
+ appUser.setTotalPoint(0);
+ }
+ if (null==appUser.getTransferableOutPoint()){
+ appUser.setTransferableOutPoint(0);
+ }
+ if (null==appUser.getAvailablePoint()){
+ appUser.setAvailablePoint(0);
+ }
+ Integer historicalPoint2 = appUser.getAvailablePoint();//历史积分
+ Integer balance2 = historicalPoint2 - point;//变动后积分
+
+
+ appUser.setAvailablePoint(balance2);//可用积分减少
+ appUser.setTotalPoint(appUser.getTotalPoint() + point);//总积分增加
+ appUser.setTransferableOutPoint(appUser.getTransferableOutPoint() + point);//转出积分增加
+
appUserService.updateById(appUser);
//构建积分流水记录
if(point > 0){
UserPoint userPoint = new UserPoint();
userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setHistoricalPoint(historicalPoint2);
userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setBalance(balance2);
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(appUserForPhoe.getId());
@@ -223,4 +262,28 @@
});
return userPointIPage;
}
+
+ @Override
+ public PageInfo<UserPointDetailVO> getUserPontDetailPageList(Collection<Integer> types, Long id, Integer pageCurr, Integer pageSize) {
+ PageInfo<UserPointDetailVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
+ List<UserPointDetailVO> list =baseMapper.getUserPontDetailPageList(pageInfo,id,types);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public Integer selectRechargeAndUse(String name, String phone, LocalDateTime beginTime, LocalDateTime endTime,Integer type) {
+
+ return baseMapper.selectRechargeAndUse(name,phone,beginTime,endTime,type);
+ }
+
+ @Override
+ public PageInfo<UserPointStatisticsPageVO> getUserPointStatisticsPageList(Collection<Integer> types, String name, String phone, LocalDateTime beginTime, LocalDateTime endTime, Integer pageCurr, Integer pageSize) {
+ PageInfo<UserPointStatisticsPageVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
+ List<UserPointStatisticsPageVO>list=baseMapper.getUserPointStatisticsPageList(pageInfo,types,name,phone,beginTime,endTime);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+
}
--
Gitblit v1.7.1