This commit is contained in:
dute7liang
2024-01-01 17:03:08 +08:00
parent 48d655f737
commit 0128d6437e
19 changed files with 276 additions and 29 deletions

View File

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.Anchor;
import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
import com.ruoyi.cai.dto.app.query.AnchorListQuery;
import com.ruoyi.cai.dto.app.query.index.AnchorListQuery;
import com.ruoyi.cai.dto.app.vo.AnchorListVo;
import com.ruoyi.common.core.domain.PageQuery;

View File

@@ -0,0 +1,14 @@
package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.UserGreet;
/**
* 群发审核Service接口
*
* @author 77
* @date 2024-01-01
*/
public interface UserGreetService extends IService<UserGreet> {
}

View File

@@ -2,11 +2,10 @@ package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.auth.CaiRegisterUser;
import com.ruoyi.cai.auth.LoginCaiUser;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
import com.ruoyi.cai.dto.app.query.UserQuery;
import com.ruoyi.cai.dto.app.query.index.GreetQuery;
import com.ruoyi.cai.dto.app.query.index.UserQuery;
import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserListVo;
import com.ruoyi.common.core.domain.PageQuery;
@@ -24,6 +23,7 @@ public interface UserService extends IService<User> {
Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query);
Page<UserListVo> pageApp(PageQuery page, UserQuery query);
Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query);
UserInfoVo info(Long userId);
@@ -36,4 +36,6 @@ public interface UserService extends IService<User> {
void checkFinishStatus(Long userId);
void resetPassword(String mobile, String password);
}

View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.Anchor;
import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
import com.ruoyi.cai.dto.app.query.AnchorListQuery;
import com.ruoyi.cai.dto.app.query.index.AnchorListQuery;
import com.ruoyi.cai.dto.app.vo.AnchorListVo;
import com.ruoyi.cai.mapper.AnchorMapper;
import com.ruoyi.cai.service.AnchorService;

View File

@@ -0,0 +1,18 @@
package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.UserGreet;
import com.ruoyi.cai.mapper.UserGreetMapper;
import com.ruoyi.cai.service.UserGreetService;
import org.springframework.stereotype.Service;
/**
* 群发审核Service业务层处理
*
* @author 77
* @date 2024-01-01
*/
@Service
public class UserGreetServiceImpl extends ServiceImpl<UserGreetMapper,UserGreet> implements UserGreetService {
}

View File

@@ -4,31 +4,23 @@ import cn.dev33.satoken.secure.BCrypt;
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.auth.CaiRegisterUser;
import com.ruoyi.cai.auth.LoginCaiUser;
import com.ruoyi.cai.domain.Anchor;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserInfo;
import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
import com.ruoyi.cai.dto.app.query.UserQuery;
import com.ruoyi.cai.dto.app.query.index.GreetQuery;
import com.ruoyi.cai.dto.app.query.index.UserQuery;
import com.ruoyi.cai.dto.app.vo.user.UserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserListVo;
import com.ruoyi.cai.dto.app.vo.user.OnlineStatusVo;
import com.ruoyi.cai.enums.CodeEnum;
import com.ruoyi.cai.manager.CodeManager;
import com.ruoyi.cai.mapper.UserMapper;
import com.ruoyi.cai.service.*;
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 io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* 用户Service业务层处理
*
@@ -68,6 +60,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
return baseMapper.pageApp(page.build(),query);
}
@Override
public Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query) {
return baseMapper.greetPageApp(page.build(),query);
}
@Override
public UserInfoVo info(Long userId) {
Long currentUserId = LoginHelper.getUserId();
@@ -82,12 +79,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
vo.setUsercode(user.getUsercode());
vo.setNickname(user.getNickname());
vo.setAvatar(user.getAvatar());
vo.setPrice(0L);
vo.setServiceCount(0L);
if(anchor != null){
vo.setPrice(anchor.getPrice());
vo.setServiceCount(anchor.getServiceCount());
}else{
vo.setPrice(null);
vo.setServiceCount(null);
if(anchor.getOrderSwitch() == 2){ // 不隐藏接单数
vo.setServiceCount(anchor.getServiceCount());
}
}
vo.setFansNum(userFollowService.getFansNumByUserId(userId));
vo.setStar(userFollowService.checkStar(currentUserId, userId));