From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 06 三月 2025 09:20:40 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 133 ++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 60 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 b56c623..4bf672f 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
@@ -4,40 +4,39 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.api.model.UserPoint;
+import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.mapper.UserPointCopyMapper;
import com.ruoyi.account.mapper.UserPointMapper;
-import com.ruoyi.account.service.AppUserService;
-import com.ruoyi.account.service.PointSettingService;
-import com.ruoyi.account.service.UserPointService;
-import com.ruoyi.account.service.VipSettingService;
+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.common.core.domain.R;
-import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.PhoneNumberValidator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.domain.PointSetting;
+import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
+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.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
/**
@@ -58,9 +57,12 @@
@Resource
private VipSettingService vipSettingService;
@Resource
- private PointSettingService pointSettingService;
+ private UserPointCopyMapper userPointCopyMapper;
@Resource
private UserPointService userPointService;
+ @Resource
+ private IAppUserGiveawayTemporaryService appUserGiveawayTemporaryService;
+
@@ -69,49 +71,54 @@
public UserPointVO getUserPoint(Long userId) {
AppUser appUser = appUserService.getById(userId);
VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userId);
-
+ List<AppUserGiveawayTemporary> list = appUserGiveawayTemporaryService.list(new LambdaQueryWrapper<AppUserGiveawayTemporary>().eq(AppUserGiveawayTemporary::getAppUserId, userId));
+ int totalPoint = 0;
+ int sharePoint = 0;
+ int shopAchievementPoint = 0;
+ int shopSharePoint = 0;
+ if(list.size() > 0){
+ totalPoint = list.stream().mapToInt(AppUserGiveawayTemporary::getTotalPoint).sum();
+ sharePoint = list.stream().mapToInt(AppUserGiveawayTemporary::getSharePoint).sum();
+ shopAchievementPoint = list.stream().mapToInt(AppUserGiveawayTemporary::getShopAchievementPoint).sum();
+ shopSharePoint = list.stream().mapToInt(AppUserGiveawayTemporary::getShopSharePoint).sum();
+ }
UserPointVO userPointVO = new UserPointVO();
- // todo bug说取剩余积分
- userPointVO.setTotalPoint(appUser.getLavePoint());
+ userPointVO.setTotalPoint(appUser.getTotalPoint() + totalPoint);
userPointVO.setConsumePoint(appUser.getAvailablePoint());
userPointVO.setShopPoint(appUser.getShopPoint());
- userPointVO.setSharePoint(appUser.getSharePoint());
+ userPointVO.setSharePoint(appUser.getSharePoint() + sharePoint);
userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
- userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint());
- userPointVO.setShopSharePoint(appUser.getShopSharePoint());
+ userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint() + shopAchievementPoint);
+ userPointVO.setShopSharePoint(appUser.getShopSharePoint() + shopSharePoint);
userPointVO.setGiftPoint(vipSetting.getVipGiftRole() == 1 ? 1 : 0);
return userPointVO;
}
+
+
@Override
public PageInfo<UserPointDetailVO> getUserPointDetail(Long userId, LocalDateTime startTime, LocalDateTime endTime, Integer type, Integer pageCurr, Integer pageSize) {
- PageInfo<UserPoint> pageInfo = new PageInfo<>(pageCurr, pageSize);
- PageInfo<UserPoint> page = this.page(pageInfo, new QueryWrapper<UserPoint>()
- .between(startTime != null, "create_time", startTime, endTime)
- .eq(type != null, "type", type)
- .eq("app_user_id", userId).orderByDesc("create_time"));
- if (CollectionUtil.isNotEmpty(page.getRecords())) {
- List<UserPointDetailVO> collect = page.getRecords().stream().map(p -> {
- UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
- userPointDetailVO.setType(p.getType());
- userPointDetailVO.setVariablePoint(p.getVariablePoint());
- String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- userPointDetailVO.setCreateTime(format);
- Integer historicalPoint = p.getHistoricalPoint();
- Integer balance = p.getBalance();
- if (historicalPoint != null && balance != null) {
- userPointDetailVO.setFlag(historicalPoint > balance ? 2 : 1);
- }
- return userPointDetailVO;
- }).collect(Collectors.toList());
- PageInfo<UserPointDetailVO> pageInfo1 = new PageInfo<>(pageCurr, pageSize);
- pageInfo1.setRecords(collect);
- pageInfo1.setTotal(page.getTotal());
- pageInfo1.setCurrent(page.getCurrent());
- pageInfo1.setSize(page.getSize());
- return pageInfo1;
+ PageInfo<UserPointDetailVO> pageInfo = new PageInfo<>(pageCurr, pageSize);
+ List<UserPointDetailVO> userPointDetail = this.baseMapper.getUserPointDetail(pageInfo, userId, startTime, endTime, type);
+ for (UserPointDetailVO userPointDetailVO : userPointDetail) {
+ Integer type1 = userPointDetailVO.getType();
+ if (type1 != null && type1.equals(12)){
+ AppUser appUser = appUserService.getById(userPointDetailVO.getReceiveUserId());
+ userPointDetailVO.setName(appUser.getName());
+ }
+ if (type1 != null && type1.equals(13)){
+ 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);
+ }
}
- return null;
+
+ pageInfo.setRecords(userPointDetail);
+ return pageInfo;
}
@@ -162,14 +169,17 @@
appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);
appUserService.updateById(appUserForPhoe);
//构建积分流水记录
- 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());
- userPointService.save(userPoint);
+ 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);
+ userPointService.save(userPoint);
+ }
Integer lavePoint = appUser.getLavePoint();
appUser.setLavePoint(appUser.getLavePoint() - point);
@@ -177,14 +187,17 @@
appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
appUserService.updateById(appUser);
//构建积分流水记录
- userPoint = new UserPoint();
- userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPointService.save(userPoint);
+ 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());
+ userPointService.save(userPoint);
+ }
return R.ok();
}
--
Gitblit v1.7.1