From 940dd1b292db4c5cc2df2f137fa46c37f2159898 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 81 insertions(+), 15 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 cca1a66..3775d83 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
@@ -3,19 +3,25 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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.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;
@@ -23,6 +29,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -34,25 +41,26 @@
* @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;
@Override
public UserPointVO getUserPoint(Long userId) {
- AppUser appUser = appUserClient.getAppUserById(userId);
+ AppUser appUser = appUserService.getById(userId);
List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
.eq(UserPoint::getAppUserId, 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("会员等级获取失败");
- }
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userId);
Integer lavePoint = appUser.getLavePoint();
UserPointVO userPointVO = new UserPointVO();
@@ -63,7 +71,7 @@
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.setGiftPoint(vipSetting.getVipGiftRole());
return userPointVO;
}
@@ -87,8 +95,66 @@
@Override
- public void transferPoint(BigDecimal point, Long phone) {
- AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ @Transactional
+ public void transferPoint(BigDecimal point, String phone) {
+ if (!PhoneNumberValidator.isValidChinaPhoneNumber(phone)) {
+ throw new ServiceException("无效的电话号码");
+ }
+
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ Long userid = loginUserApplet.getUserid();
+
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userid);
+ if (vipSetting == null) {
+ throw new ServiceException("VIP 设置未找到");
+ }
+ if (vipSetting.getVipGiftRole() == 0) {
+ throw new ServiceException("转赠积分权限未开启");
+ }
+
+ AppUser appUser = appUserService.getById(userid);
+ if (appUser == null) {
+ throw new ServiceException("用户未找到");
+ }
+ Integer totalPoint = appUser.getLavePoint();
+
+ PointSetting pointSetting = pointSettingService.getPointSettingByAppUserId(userid);
+ if (pointSetting == null) {
+ throw new ServiceException("积分设置未找到");
+ }
+ Integer buyPointOpen = pointSetting.getBuyPointOpen();
+
+ List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
+ .eq(UserPoint::getAppUserId, userid));
+ Map<Integer, Integer> userBalanceMap = userPointList.stream()
+ .collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
+
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.CONSUME.getCode(), buyPointOpen == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.COMMISSION_RETURN.getCode(), pointSetting.getSharePointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.STORE_COMMISSION_RETURN.getCode(), pointSetting.getShopSharePointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.STORE_PERFORMANCE.getCode(), pointSetting.getShopPointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.TECHNICIAN_PERFORMANCE.getCode(), pointSetting.getPersonPointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.NEW_USER_REFERRAL.getCode(), pointSetting.getGetNewPointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.REGISTRATION.getCode(), pointSetting.getGetRegisPointOpen() == 0);
+ totalPoint -= getAdjustedPoint(userBalanceMap, PointChangeType.WORK_PERFORMANCE.getCode(), pointSetting.getWorkPointOpen() == 0);
+
+ if (point.compareTo(new BigDecimal(totalPoint)) > 0) {
+ throw new ServiceException("转赠积分不足");
+ }
+
+ AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
.eq(AppUser::getPhone, phone));
+ if (appUserForPhoe == null) {
+ throw new ServiceException("目标用户未找到");
+ }
+
+ appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point.intValue());
+ appUserService.updateById(appUserForPhoe);
+
+ log.info("积分转赠完成，用户ID: {}, 新积分: {}", appUserForPhoe.getId(), appUserForPhoe.getLavePoint());
+ }
+
+ private int getAdjustedPoint(Map<Integer, Integer> userBalanceMap, int pointTypeCode, boolean isOpen) {
+ return isOpen ? 0 : Optional.ofNullable(userBalanceMap.get(pointTypeCode)).orElse(0);
}
}
--
Gitblit v1.7.1