shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
777
2026-01-21 13:45:27 +08:00
parent 88f9a67d0c
commit 7598710f54
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java
View File

@@ -43,6 +43,7 @@ public class UserInfo {
private BigDecimal payIncomeRate; private BigDecimal payIncomeRate;
/** /**
*/ */
@Deprecated
private BigDecimal pointRate; private BigDecimal pointRate;
/** /**
* 登录次数 * 登录次数

2
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java
View File

@@ -64,7 +64,7 @@ public enum SystemConfigEnum {
/** /**
* 抽奖和积分 * 抽奖和积分
*/ */
DEFAULT_PAY_POINT_RATE("0", "默认分销上级充值的积分提成",SystemConfigGroupEnum.BUSINESS,new RateAllowZeroSystemConfigCheck()), DEFAULT_PAY_POINT_RATE("0", "分销上级充值的积分提成",SystemConfigGroupEnum.DRAW,new RateAllowZeroSystemConfigCheck()),
OPEN_DRAW_WOMEN("1","是否开启女用户积分抽奖",SystemConfigGroupEnum.DRAW,new BooleanSystemConfigCheck()), OPEN_DRAW_WOMEN("1","是否开启女用户积分抽奖",SystemConfigGroupEnum.DRAW,new BooleanSystemConfigCheck()),
OPEN_DRAW_MAN("1","是否开启男用户积分抽奖",SystemConfigGroupEnum.DRAW,new BooleanSystemConfigCheck()), OPEN_DRAW_MAN("1","是否开启男用户积分抽奖",SystemConfigGroupEnum.DRAW,new BooleanSystemConfigCheck()),
WOMEN_DRAW_POINT("100","女用户抽奖分数",SystemConfigGroupEnum.DRAW,new NumberSystemConfigCheck()), WOMEN_DRAW_POINT("100","女用户抽奖分数",SystemConfigGroupEnum.DRAW,new NumberSystemConfigCheck()),

13
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java
View File

@@ -6,8 +6,10 @@ import com.ruoyi.cai.domain.*;
import com.ruoyi.cai.dto.AddPointAdminDto; import com.ruoyi.cai.dto.AddPointAdminDto;
import com.ruoyi.cai.enums.ConsumeLogStatus; import com.ruoyi.cai.enums.ConsumeLogStatus;
import com.ruoyi.cai.enums.PointLogType; import com.ruoyi.cai.enums.PointLogType;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.lottery.PointManager; import com.ruoyi.cai.lottery.PointManager;
import com.ruoyi.cai.manager.IdManager; import com.ruoyi.cai.manager.IdManager;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.mapper.AccountMapper;
import com.ruoyi.cai.mapper.PointRecordLogMapper; import com.ruoyi.cai.mapper.PointRecordLogMapper;
import com.ruoyi.cai.service.*; import com.ruoyi.cai.service.*;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -39,6 +42,8 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
@Resource @Resource
private AccountMapper accountMapper; private AccountMapper accountMapper;
@Autowired @Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private PointChangeLogService pointChangeLogService; private PointChangeLogService pointChangeLogService;
@Autowired @Autowired
private PointManager pointManager; private PointManager pointManager;
@@ -66,8 +71,8 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
if(userInvite != null){ if(userInvite != null){
User oneUser = userService.getById(userInvite.getInviteId()); User oneUser = userService.getById(userInvite.getInviteId());
if(oneUser != null && oneUser.getStatus() == 0){ if(oneUser != null && oneUser.getStatus() == 0){
UserInfo inviteUserInfo = userInfoService.getByUserId(userInvite.getInviteId()); BigDecimal payPointRate = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_PAY_POINT_RATE);
pointLog.setOneRate(inviteUserInfo.getPointRate()); pointLog.setOneRate(payPointRate);
pointLog.setOneUserId(oneUser.getId()); pointLog.setOneUserId(oneUser.getId());
pointLog.setOneUsercode(oneUser.getUsercode()); pointLog.setOneUsercode(oneUser.getUsercode());
pointLog.setOnePhone(oneUser.getMobile()); pointLog.setOnePhone(oneUser.getMobile());
@@ -102,8 +107,8 @@ public class PointRecordLogServiceImpl extends ServiceImpl<PointRecordLogMapper,
if(userInvite != null){ if(userInvite != null){
User oneUser = userService.getById(userInvite.getInviteId()); User oneUser = userService.getById(userInvite.getInviteId());
if(oneUser != null && oneUser.getStatus() == 0){ if(oneUser != null && oneUser.getStatus() == 0){
UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId()); BigDecimal payPointRate = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_PAY_POINT_RATE);
pointLog.setOneRate(userInfo.getPointRate()); pointLog.setOneRate(payPointRate);
pointLog.setOneUserId(oneUser.getId()); pointLog.setOneUserId(oneUser.getId());
pointLog.setOneUsercode(oneUser.getUsercode()); pointLog.setOneUsercode(oneUser.getUsercode());
pointLog.setOnePhone(oneUser.getMobile()); pointLog.setOnePhone(oneUser.getMobile());