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 9aa21891..0a72ed52 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 @@ -27,6 +27,7 @@ public enum SystemConfigEnum { NO_ANCHOR_ALBUM_AVATAR_IGNORE_AUDIT("0", "开启非主播头像免审核",SystemConfigGroupEnum.BUSINESS, new BooleanSystemConfigCheck()), REGISTER_AWARD("88", "注册奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), FAST_PAY_AWARD("300", "首充奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), + JOIN_ANCHOR_INVITE_AWARD("300", "主播入驻邀请人奖励",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), GUARD_PRICE("1314", "守护价格",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_GIFT_THRESHOLD("10", "礼物飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), WINDOW_RECHARGE_THRESHOLD("10", "充值飘窗阈值",SystemConfigGroupEnum.BUSINESS, new NumberSystemConfigCheck()), diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/AwardManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/AwardManager.java index 3393a2f4..5d2ea92a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/AwardManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/AwardManager.java @@ -44,6 +44,29 @@ public class AwardManager { @Autowired private YunxinHttpService yunxinHttpService; + public void giveJoinAnchorAsync(Long userId){ + AwardManager bean = SpringUtil.getBean(AwardManager.class); + ExecutorConstant.COMMON_EXECUTOR.execute(() -> { + bean.giveJoinAnchor(userId); + }); + } + + @Transactional(rollbackFor = Exception.class) + public void giveJoinAnchor(Long userId) { + Long price = systemConfigManager.getSystemConfigOfLong(SystemConfigEnum.JOIN_ANCHOR_INVITE_AWARD); + if(price == 0){ + return; + } + User user = userService.getById(userId); + if(user == null){ + log.error("主播入驻邀请奖励领取失败 用户不存在 userId={}",userId); + return; + } +// accountMapper.incsIncomeCoin(userId,price); +// accountChangeLogService.saveLogNoAdmin(user.getId(),user.getUsercode(), AccountChangeCodeEnum.FAST_PAY_AWARD,price,traceId); + + } + public void giveRegisterAsync(Long userId){ AwardManager bean = SpringUtil.getBean(AwardManager.class); ExecutorConstant.COMMON_EXECUTOR.execute(() -> { @@ -51,6 +74,7 @@ public class AwardManager { }); } + public void giveRegister(Long userId){ Long price = systemConfigManager.getSystemConfigOfLong(SystemConfigEnum.REGISTER_AWARD); if(price == 0){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java index b556461a..e0d65a8e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java @@ -2,6 +2,7 @@ package com.ruoyi.cai.manager; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.constant.RedisHttpConstant; +import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.admin.vo.AnchorTopAdminVo; import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; import com.ruoyi.cai.dto.app.vo.AnchorListVo; @@ -12,7 +13,9 @@ import com.ruoyi.cai.mq.AmqpProducer; import com.ruoyi.cai.mq.handle.dto.LoginNotifyDTO; import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.AnchorTopService; +import com.ruoyi.cai.service.UserService; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.ServletUtils; import org.apache.commons.collections4.CollectionUtils; @@ -38,6 +41,10 @@ public class HomeManager { private AnchorTopService anchorTopService; @Autowired private RedissonClient redissonClient; + @Autowired + private UserService userService; + @Autowired + private UserForbidManager userForbidManager; public void refreshHomeAnchorTopCache(){ List anchorTop = anchorTopService.anchorTop(4); @@ -147,6 +154,15 @@ public class HomeManager { config.setOssDomain(systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN)); config.setOpenWithdraw(systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WITHDRAW)); Long userId = LoginHelper.getUserId(); + User user = userService.getById(userId); + String imei = ServletUtils.getImei(); + UserForbidManager.CheckForbid forbid = userForbidManager.checkForbid(user.getId(), user.getUsercode(), imei, ServletUtils.getClientIP()); + if(forbid != null && forbid.isForbid()){ + throw new ServiceException(forbid.getMessage()); + } + if(user.getStatus() != 0){ + throw new ServiceException("用户已封禁,请联系客服"); + } if(userId != null){ LoginNotifyDTO loginUserDTO = new LoginNotifyDTO(); loginUserDTO.setUserId(userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java index 2bb294ae..c7385a7d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AnchorApplyServiceImpl.java @@ -126,6 +126,7 @@ public class AnchorApplyServiceImpl extends ServiceImpl