123

2024-01-26 18:41:28 +08:00
parent 36eee916b1
commit 97ba46f6e4
16 changed files with 187 additions and 59 deletions
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java
@@ -8,6 +8,7 @@ import com.ruoyi.cai.dto.app.dto.GuardNum;
 import com.ruoyi.cai.dto.app.query.GiveGuardReq;
 import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo;
 import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo;
+import com.ruoyi.cai.dto.commom.consumer.GuardConsumerResp;
 import com.ruoyi.common.core.domain.PageQuery;

 /**
@@ -20,7 +21,7 @@ public interface GuardTotalService extends IService<GuardTotal> {

    GuardIndexVo guardInfoVo(Long fromUserId,Long toUserId, Integer limit);

-    ConsumeResp giveGuard(GiveGuardReq query);
+    GuardConsumerResp giveGuard(GiveGuardReq query);

    GuardNum getGuardNum(Long fromUserId, Long toUserId);

--- 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
@@ -13,6 +13,7 @@ import com.ruoyi.cai.enums.GenderEnum;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.mapper.AnchorApplyMapper;
+import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.AnchorApplyService;
 import com.ruoyi.cai.service.AnchorService;
 import com.ruoyi.cai.service.UserService;
@@ -39,6 +40,8 @@ public class AnchorApplyServiceImpl extends ServiceImpl<AnchorApplyMapper, Ancho
    private AnchorService anchorService;
    @Autowired
    private SystemConfigManager systemConfigManager;
+    @Autowired
+    private YunxinHttpService yunxinHttpService;

    @Override
    public AnchorApply getByUserId(Long userId){
@@ -135,11 +138,16 @@ public class AnchorApplyServiceImpl extends ServiceImpl<AnchorApplyMapper, Ancho
        save.setGuardRate(systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_ANCHOR_GUARD_PRICE));
        save.setGiftRate(systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.DEFAULT_ANCHOR_GIFT_PRICE));
        anchorService.save(save);
+        yunxinHttpService.passAnchorSendMessage(userId);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void auditAnchorFail(Long id) {
+        AnchorApply anchorApply = this.getById(id);
+        if(anchorApply == null){
+            return;
+        }
        this.update(Wrappers.lambdaUpdate(AnchorApply.class)
                .eq(AnchorApply::getId,id)
                .set(AnchorApply::getAuditTime,LocalDateTime.now())
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java
@@ -10,6 +10,7 @@ import com.ruoyi.cai.dto.app.dto.GuardTotalDTO;
 import com.ruoyi.cai.dto.app.query.GiveGuardReq;
 import com.ruoyi.cai.dto.app.vo.index.GuardIndexVo;
 import com.ruoyi.cai.dto.app.vo.index.GuardListPageVo;
+import com.ruoyi.cai.dto.commom.consumer.GuardConsumerResp;
 import com.ruoyi.cai.enums.ConsumeLogType;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.IdManager;
@@ -81,7 +82,7 @@ public class GuardTotalServiceImpl extends ServiceImpl<GuardTotalMapper, GuardTo

    @Override
    @Transactional(rollbackFor = Exception.class)
-    public ConsumeResp giveGuard(GiveGuardReq query) {
+    public GuardConsumerResp giveGuard(GiveGuardReq query) {
        Long fromUserId = LoginHelper.getUserId();
        User fromUser = userService.getById(fromUserId);
        User toUser = userService.getById(query.getToUserId());
@@ -104,7 +105,7 @@ public class GuardTotalServiceImpl extends ServiceImpl<GuardTotalMapper, GuardTo
        if(lock.isLocked()){
            throw new ServiceException("您点击太快了");
        }
-        ConsumeResp resp = new ConsumeResp();
+        GuardConsumerResp resp = new GuardConsumerResp();
        try {
            lock.lock(3, TimeUnit.SECONDS);
            Long guardValue = query.getGuardNum() * guardPrice;
@@ -117,6 +118,9 @@ public class GuardTotalServiceImpl extends ServiceImpl<GuardTotalMapper, GuardTo
            consumeLog.setTargetRate(anchor.getGuardRate());
            consumeLog = accountService.guardDecr(consumeLog, ConsumeLogType.GUARD);
            resp.setConsumeLogId(consumeLog.getId());
+            resp.setFromUid(fromUserId);
+            resp.setToUid(query.getToUserId());
+            resp.setAnchorIncomeCoin(consumeLog.getAnchorAmount());
            GuardLog guardLog = new GuardLog();
            guardLog.setFromUserId(fromUserId);
            guardLog.setFromUsercode(fromUser.getUsercode());
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserFollowServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.cai.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.domain.UserCount;
 import com.ruoyi.cai.domain.UserFollow;
 import com.ruoyi.cai.dto.app.query.StarQuery;
@@ -10,9 +11,11 @@ import com.ruoyi.cai.dto.app.query.StarOrVisitorReq;
 import com.ruoyi.cai.dto.app.vo.user.UserBaseVo;
 import com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList;
 import com.ruoyi.cai.mapper.UserFollowMapper;
+import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.service.UserCountService;
 import com.ruoyi.cai.service.UserFollowService;
 import com.ruoyi.cai.service.UserMemberService;
+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;
@@ -22,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -40,6 +44,10 @@ public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFol
    private UserCountService userCountService;
    @Autowired
    private UserMemberService userMemberService;
+    @Autowired
+    private YunxinHttpService yunxinHttpService;
+    @Autowired
+    private UserService userService;

    @Override
    public Long getFansNumByUserId(Long userId){
@@ -58,6 +66,10 @@ public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFol
    @Transactional(rollbackFor = Exception.class)
    public boolean star(StarOrVisitorReq starOrVisitorReq) {
        Long fromUserId = LoginHelper.getUserId();
+        User user = userService.getById(fromUserId);
+        if(user == null){
+            throw new ServiceException("您的账号已被注销");
+        }
        if(starOrVisitorReq.getToUserId().equals(fromUserId)){
            throw new ServiceException("不能关注自己哦");
        }
@@ -69,6 +81,7 @@ public class UserFollowServiceImpl extends ServiceImpl<UserFollowMapper, UserFol
        userFollow.setFollowUser(starOrVisitorReq.getToUserId());
        this.save(userFollow);
        userCountService.star(fromUserId, starOrVisitorReq.getToUserId());
+        yunxinHttpService.followedSendMessage(starOrVisitorReq.getToUserId(), user, LocalDateTime.now());
        return true;
    }

--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java
@@ -85,6 +85,8 @@ public class UserGiftServiceImpl extends ServiceImpl<UserGiftMapper, UserGift> i
            consumeLog = accountService.giftDecr(consumeLog, ConsumeLogType.GIFT, gift);
            resp.setAnchorIncomeCoin(consumeLog.getAnchorAmount());
            resp.setConsumeLogId(consumeLog.getId());
+            resp.setFromUid(fromUserId);
+            resp.setToUid(query.getToUserId());
            UserGift userGift = new UserGift();
            userGift.setType(query.getType());
            userGift.setFromUid(fromUserId);