From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 183 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 28 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 35a79e3..8223d51 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
@@ -2,24 +2,35 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserPoint;
-import com.ruoyi.account.enums.PointChangeType;
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.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.security.service.TokenService;
+import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.VipSetting;
-import com.ruoyi.other.api.feignClient.RemoteVipSettingClient;
+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 javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -34,36 +45,36 @@
* @since 2024-11-21
*/
@Service
+@Slf4j
public class UserPointServiceImpl extends ServiceImpl<UserPointMapper, UserPoint> implements UserPointService {
@Resource
- private AppUserClient appUserClient;
+ private AppUserService appUserService;
@Resource
- private RemoteVipSettingClient remoteVipSettingClient;
+ private TokenService tokenService;
+ @Resource
+ private VipSettingService vipSettingService;
+ @Resource
+ private PointSettingService pointSettingService;
+ @Resource
+ private UserPointService userPointService;
+
+
+
@Override
public UserPointVO getUserPoint(Long userId) {
- AppUser appUser = appUserClient.getAppUserById(userId);
- List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
- .eq(UserPoint::getAppUserId, userId));
+ AppUser appUser = appUserService.getById(userId);
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userId);
- Map<Integer, Integer> userBalanceMap = userPointList.stream()
- .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
-
- R<VipSetting> r = remoteVipSettingClient.getVipSettingById(appUser.getVipId());
- if (!R.isSuccess(r)){
- throw new RuntimeException("会员等级获取失败");
- }
-
- Integer lavePoint = appUser.getLavePoint();
UserPointVO userPointVO = new UserPointVO();
- userPointVO.setTotalPoint(lavePoint);
-// userPointVO.setConsumePoint(lavePoint);
- userPointVO.setShopPoint(userBalanceMap.get(PointChangeType.CONSUME.getCode()));
- userPointVO.setSharePoint(userBalanceMap.get(PointChangeType.COMMISSION_RETURN.getCode()));
- userPointVO.setPullNewPoint(userBalanceMap.get(PointChangeType.NEW_USER_REFERRAL.getCode()));
- userPointVO.setShopAchievementPoint(userBalanceMap.get(PointChangeType.STORE_PERFORMANCE.getCode()));
- userPointVO.setShopSharePoint(userBalanceMap.get(PointChangeType.STORE_COMMISSION_RETURN.getCode()));
- userPointVO.setGiftPoint(r.getData().getVipGiftRole());
+ userPointVO.setTotalPoint(appUser.getTotalPoint());
+ userPointVO.setConsumePoint(appUser.getAvailablePoint());
+ userPointVO.setShopPoint(appUser.getShopPoint());
+ userPointVO.setSharePoint(appUser.getSharePoint());
+ userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
+ userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint());
+ userPointVO.setShopSharePoint(appUser.getShopSharePoint());
+ userPointVO.setGiftPoint(vipSetting.getVipGiftRole() == 1 ? 1 : 0);
return userPointVO;
}
@@ -72,16 +83,132 @@
List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
.between(startTime != null, UserPoint::getCreateTime, startTime, endTime)
.eq(type != null, UserPoint::getType, type)
- .eq(UserPoint::getAppUserId, userId));
+ .eq(UserPoint::getAppUserId, userId).orderByDesc(UserPoint::getCreateTime));
if (CollectionUtil.isNotEmpty(userPointList)) {
return userPointList.stream().map(p -> {
UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
userPointDetailVO.setType(p.getType());
userPointDetailVO.setVariablePoint(p.getVariablePoint());
- userPointDetailVO.setCreateTime(p.getCreateTime());
+ String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ userPointDetailVO.setCreateTime(format);
return userPointDetailVO;
}).collect(Collectors.toList());
}
return Collections.emptyList();
}
+
+
+ @Override
+ @Transactional
+ public R transferPoint(Integer point, String phone) {
+ if (!PhoneNumberValidator.isValidChinaPhoneNumber(phone)) {
+ return R.fail("无效的电话号码");
+ }
+
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ Long userid = loginUserApplet.getUserid();
+
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userid);
+ if (vipSetting == null) {
+ return R.fail("VIP 设置未找到");
+ }
+ if (vipSetting.getId() == 0 && vipSetting.getVipGiftRole() == 0) {
+ return R.fail("转赠积分权限未开启");
+ }
+
+ AppUser appUser = appUserService.getById(userid);
+ if (appUser == null) {
+ return R.fail("用户未找到");
+ }
+
+ PointSetting pointSetting = pointSettingService.getPointSettingByAppUserId(userid);
+ if (pointSetting == null) {
+ return R.fail("积分设置未找到");
+ }
+ // 可转赠积分总数
+ Integer transferablePoint = appUser.getTransferablePoint();
+ if (point > transferablePoint) {
+ return R.fail("转赠积分不足");
+ }
+
+ AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getPhone, phone));
+ if (appUserForPhoe == null) {
+ 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);
+ 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);
+
+ Integer lavePoint = appUser.getLavePoint();
+ appUser.setLavePoint(lavePoint - point);
+ Integer totalPoint = appUser.getTotalPoint();
+ appUser.setTotalPoint(totalPoint - point);
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - point);
+ 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);
+ return R.ok();
+ }
+
+
+ @Override
+ public UserPointStatistics getStatistics(UserPoint userPoint) {
+ List<UserPoint> userPointList = this.baseMapper.selectUserPoint(userPoint);
+ Map<Integer, Integer> userBalanceMap = userPointList.stream()
+ .collect(Collectors.groupingBy(
+ UserPoint::getType,
+ Collectors.summingInt(UserPoint::getVariablePoint)
+ ));
+
+ int consumePoint = userBalanceMap.getOrDefault(PointChangeType.CONSUME.getCode(), 0);
+ int sharePoint = userBalanceMap.getOrDefault(PointChangeType.REBATE.getCode(), 0);
+ 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);
+ int workPoint = share + signIn + useTime;
+
+ int shopAchievementPoint = userBalanceMap.getOrDefault(PointChangeType.TECHNICIAN_ACHIEVEMENT.getCode(), 0);
+ //总积分
+ int totalPoint = consumePoint+sharePoint+pullNewPoint+registerPoint+workPoint+shopAchievementPoint;
+ UserPointStatistics userPointStatistics = new UserPointStatistics();
+ userPointStatistics.setTotalPoint(totalPoint);
+ userPointStatistics.setConsumePoint(consumePoint);
+ userPointStatistics.setSharePoint(sharePoint);
+ userPointStatistics.setPullNewPoint(pullNewPoint);
+ userPointStatistics.setRegisterPoint(registerPoint);
+ userPointStatistics.setWorkPoint(workPoint);
+ userPointStatistics.setShopAchievementPoint(shopAchievementPoint);
+ return userPointStatistics;
+ }
+
+
+ @Override
+ public IPage<UserPoint> getUserPointPage(Page<UserPoint> page, UserPoint userPoint) {
+ return this.baseMapper.queryUserPointPage(page, userPoint);
+ }
}
--
Gitblit v1.7.1