diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java index 126a2c70..b7e8262e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserInfo.java @@ -43,6 +43,7 @@ public class UserInfo { private BigDecimal payIncomeRate; /** */ + @Deprecated private BigDecimal pointRate; /** * 登录次数 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index ceea47bf..5e113b62 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -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_MAN("1","是否开启男用户积分抽奖",SystemConfigGroupEnum.DRAW,new BooleanSystemConfigCheck()), WOMEN_DRAW_POINT("100","女用户抽奖分数",SystemConfigGroupEnum.DRAW,new NumberSystemConfigCheck()), diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java index a178d1db..5f040733 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PointRecordLogServiceImpl.java @@ -6,8 +6,10 @@ import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.AddPointAdminDto; import com.ruoyi.cai.enums.ConsumeLogStatus; import com.ruoyi.cai.enums.PointLogType; +import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.lottery.PointManager; import com.ruoyi.cai.manager.IdManager; +import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.mapper.PointRecordLogMapper; import com.ruoyi.cai.service.*; @@ -19,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -39,6 +42,8 @@ public class PointRecordLogServiceImpl extends ServiceImpl