diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 2f5f780d9..ace4b800d 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -103,7 +103,7 @@ spring.data: # 地址 host: localhost # 端口，默认为6379 - port: 6379 + port: 26379 # 数据库索引 database: 0 # redis 密码必须配置 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/CommentController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/CommentController.java index 2de25b5ce..bcecf093f 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/CommentController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/CommentController.java @@ -13,11 +13,11 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +// import org.dromara.common.mybatis.core.page.PageQuery; +// import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.common.core.constant.HttpStatus; +// import org.dromara.common.core.constant.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,11 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; import java.util.HashMap; -import java.util.Collections; +import com.wzj.soopin.content.utils.RedisOperator; +import com.wzj.soopin.content.service.MsgService; +import com.wzj.soopin.content.domain.base.BaseInfoProperties; +import com.wzj.soopin.content.enums.MessageEnum; +// import com.wzj.soopin.content.domain.po.Comment; @Slf4j @Api(tags = "管理端-评论管理接口") @@ -36,6 +40,12 @@ public class CommentController extends BaseController { @Autowired private CommentService commentService; + @Autowired + private RedisOperator redis; + + @Autowired + private MsgService msgService; + @ApiOperation("获取评论列表") @PostMapping("/list") public R> list( @@ -62,6 +72,51 @@ public class CommentController extends BaseController { } } + @ApiOperation("发布评论") + @PostMapping("/publish") + public R publishComment(@RequestBody CommentBO bo) { + try { + // 鉴权：评论人从登录上下文获取，覆盖入参 + Long loginUserId = LoginHelper.getUserId(); + if (loginUserId == null) { + return R.fail("未登录或登录已过期"); + } + bo.setCommentUserId(String.valueOf(loginUserId)); + + // 父评论为空时，按根评论处理（约定使用"0"作为无父评论标记） + if (bo.getFatherCommentId() == null || bo.getFatherCommentId().isEmpty()) { + bo.setFatherCommentId("0"); + } + + // 1) 创建评论 + commentService.createComment(bo); + + // 2) 短视频评论总数 +1（Redis 优先） + redis.increment(BaseInfoProperties.REDIS_VLOG_COMMENT_COUNTS + ":" + bo.getVlogId(), 1); + + // 3) 发送站内消息：根评论 -> 通知视频作者；回复评论 -> 通知被回复用户 + if ("0".equals(bo.getFatherCommentId())) { + // 评论视频，通知视频作者 + if (bo.getVlogerId() != null && !bo.getVlogerId().isEmpty() + && !String.valueOf(loginUserId).equals(bo.getVlogerId())) { + msgService.createMsg(String.valueOf(loginUserId), bo.getVlogerId(), MessageEnum.COMMENT_VLOG.type, null); + } + } else { + // 回复评论，通知父评论作者 + Comment father = commentService.getCommentDetail(bo.getFatherCommentId()); + if (father != null && father.getCommentUserId() != null + && !String.valueOf(loginUserId).equals(father.getCommentUserId())) { + msgService.createMsg(String.valueOf(loginUserId), father.getCommentUserId(), MessageEnum.REPLY_YOU.type, null); + } + } + + return R.ok(); + } catch (Exception e) { + log.error("发布评论失败", e); + return R.fail("发布评论失败: " + e.getMessage()); + } + } + @ApiOperation("删除评论") @PostMapping("/delete") public R deleteComment( diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java index 0c0797fc1..b4b807839 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java @@ -131,18 +131,14 @@ public class VlogUploadController extends BaseInfoProperties { mediaMap.put("description", basicInfo.getDescription()); mediaMap.put("createTime", basicInfo.getCreateTime()); mediaMap.put("updateTime", basicInfo.getUpdateTime()); - mediaMap.put("expireTime", basicInfo.getExpireTime()); - mediaMap.put("classId", basicInfo.getClassId()); - mediaMap.put("className", basicInfo.getClassName()); - mediaMap.put("classPath", basicInfo.getClassPath()); mediaMap.put("coverUrl", basicInfo.getCoverUrl()); mediaMap.put("type", basicInfo.getType()); mediaMap.put("mediaUrl", basicInfo.getMediaUrl()); mediaMap.put("status", basicInfo.getStatus()); - mediaMap.put("storageRegion", basicInfo.getStorageRegion()); mediaMap.put("category", basicInfo.getCategory()); - mediaMap.put("storageClass", basicInfo.getStorageClass()); - mediaMap.put("tagSet", basicInfo.getTagSet()); + mediaMap.put("title",vlogBO.getTitle()); + mediaMap.put("firstFrameImg",vlogBO.getFirstFrameImg()); + mediaMap.put("vlogerId",vlogBO.getVlogerId()); // 获取视频统计信息 Map statistics = vlogService.getVlogStatistics(mediaInfo.getFileId()); diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/MyListBO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/MyListBO.java index 8b8837a5a..0240641c7 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/MyListBO.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/MyListBO.java @@ -10,6 +10,13 @@ public class MyListBO { @Schema(description = "是否公开（1公开，0私密）") private Integer yesOrNo; + + @Schema(description = "页码", defaultValue = "1") + private Long pageNum = 1L; + + @Schema(description = "每页大小", defaultValue = "10") + private Long pageSize = 10L; + // getter/setter public String getUserId() { return userId; } public void setUserId(String userId) { this.userId = userId; } @@ -18,4 +25,10 @@ public class MyListBO { public Integer getYesOrNo() { return yesOrNo; } public void setYesOrNo(Integer yesOrNo) { this.yesOrNo = yesOrNo; } + + public Long getPageNum() { return pageNum; } + public void setPageNum(Long pageNum) { this.pageNum = pageNum; } + + public Long getPageSize() { return pageSize; } + public void setPageSize(Long pageSize) { this.pageSize = pageSize; } } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/mo/MessageMO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/mo/MessageMO.java index f7c4ac514..c54c80b9e 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/mo/MessageMO.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/mo/MessageMO.java @@ -33,7 +33,7 @@ public class MessageMO { @TableField("msgType") private Integer msgType; // 消息类型 枚举 @TableField("msgContent") - private Map msgContent; // 消息内容 + private Map msgContent; // 消息内容 @TableField("createTime") private Date createTime; // 消息创建时间 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/vo/CommentVO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/vo/CommentVO.java index 2642aa1bb..fe785018b 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/vo/CommentVO.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/vo/CommentVO.java @@ -25,7 +25,6 @@ public class CommentVO { private Integer likeCounts; private String replyedUserNickname; private LocalDateTime createTime; - private Integer isLike = 0; private Integer childCount; // 子评论数 private Integer status; private String vlogerMobile; // 视频作者手机号 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java index 6900da9ff..814f19b6f 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/MyLikedVlogMapper.java @@ -18,6 +18,6 @@ public interface MyLikedVlogMapper extends BaseMapperPlus> selectLikedUsersByVlogId(@Param("vlogId") String vlogId); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java index 3470d9b65..3b2c85cb9 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/mapper/repository/MessageRepository.java @@ -1,18 +1,23 @@ package com.wzj.soopin.content.mapper.repository; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.wzj.soopin.content.domain.mo.MessageMO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; import java.util.List; +@InterceptorIgnore(tenantLine = "true") +@Mapper @Repository public interface MessageRepository { // 通过实现Repository，自定义条件查询 - List findAllByToUserIdEqualsOrderByCreateTimeDesc(String toUserId, - Pageable pageable); + List findAllByToUserIdEqualsOrderByCreateTimeDesc(@Param("toUserId") String toUserId, + @Param("pageable") Pageable pageable); void save(MessageMO messageMO); -// void deleteAllByFromUserIdAndToUserIdAndMsgType(); + // void deleteAllByFromUserIdAndToUserIdAndMsgType(); } diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/MsgService.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/MsgService.java index b44f8c5bb..fe79901d8 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/MsgService.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/MsgService.java @@ -14,7 +14,7 @@ public interface MsgService { public void createMsg(String fromUserId, String toUserId, Integer type, - Map msgContent); + Map msgContent); /** * 查询消息列表 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/MsgServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/MsgServiceImpl.java index 75bedca4b..dbac54880 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/MsgServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/MsgServiceImpl.java @@ -3,13 +3,11 @@ package com.wzj.soopin.content.service.impl; import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.mo.MessageMO; -import com.wzj.soopin.content.domain.po.Users; import com.wzj.soopin.content.enums.MessageEnum; import com.wzj.soopin.content.mapper.repository.MessageRepository; import com.wzj.soopin.content.service.MsgService; import com.wzj.soopin.member.domain.po.Member; import com.wzj.soopin.member.mapper.MemberMapper; -import com.wzj.soopin.member.service.IMemberService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,15 +34,18 @@ public class MsgServiceImpl extends BaseInfoProperties implements MsgService { public void createMsg(String fromUserId, String toUserId, Integer type, - Map msgContent) { + Map msgContent) { Member fromUser = memberMapper.selectById(fromUserId); MessageMO messageMO = new MessageMO(); messageMO.setFromUserId(fromUserId); - messageMO.setFromNickname(fromUser.getNickname()); - messageMO.setFromFace(fromUser.getAvatar()); + // 兼容会员资料缺失的情况，避免空指针 + String fromNickname = fromUser != null && fromUser.getNickname() != null ? fromUser.getNickname() : ""; + String fromFace = fromUser != null && fromUser.getAvatar() != null ? fromUser.getAvatar() : ""; + messageMO.setFromNickname(fromNickname); + messageMO.setFromFace(fromFace); messageMO.setToUserId(toUserId); @@ -74,9 +75,9 @@ public class MsgServiceImpl extends BaseInfoProperties implements MsgService { for (MessageMO msg : list) { // 如果类型是关注消息，则需要查询我之前有没有关注过他，用于在前端标记“互粉”“互关” if (msg.getMsgType() != null && msg.getMsgType() == MessageEnum.FOLLOW_YOU.type) { - Map map = msg.getMsgContent(); + Map map = (Map) msg.getMsgContent(); if (map == null) { - map = new HashMap(); + map = new HashMap<>(); } String relationship = redis.get(REDIS_FANS_AND_VLOGGER_RELATIONSHIP + ":" + msg.getToUserId() + ":" + msg.getFromUserId()); diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index 58e99b28b..0b6f62342 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -208,7 +208,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { List voList = vlogList.stream().map(v -> { IndexVlogVO vo = vlogConvert.toVO(v); if (StringUtils.isNotBlank(userId)) { - vo.setDoIFollowVloger(fansService.queryDoIFollowVloger(Long.valueOf(userId), Long.valueOf(v.getVlogerId()))); + vo.setDoIFollowVloger(fansService.queryDoIFollowVloger(userId, v.getVlogerId())); vo.setDoILikeThisVlog(doILikeVlog(userId, v.getId())); } vo.setLikeCounts(getVlogBeLikedCounts(v.getId())); @@ -307,8 +307,29 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { queryWrapper.eq(Vlog::getIsPrivate, bo.getYesOrNo()); Page vlogPage = vlogMapper.selectPage(pageParam, queryWrapper); List vlogList = vlogPage.getRecords(); - // TODO: 组装PagedGridResult返回 - return null; + + List voList = vlogList.stream().map(vlog -> { + IndexVlogVO vo = vlogConvert.toVO(vlog); + String uid = bo.getUserId(); + if (StringUtils.isBlank(uid)) { + LoginUser user = LoginHelper.getLoginUser(); + uid = user != null ? String.valueOf(user.getUserId()) : null; + } + if (StringUtils.isNotBlank(uid)) { + vo.setDoIFollowVloger(fansService.queryDoIFollowVloger(uid, vlog.getVlogerId())); + vo.setDoILikeThisVlog(doILikeVlog(uid, vlog.getId())); + } + vo.setLikeCounts(getVlogBeLikedCounts(vlog.getId())); + vo.setCommentsCounts(getVlogComment(vlog.getId())); + return vo; + }).collect(Collectors.toList()); + + PagedGridResult gridResult = new PagedGridResult(); + gridResult.setRows(voList); + gridResult.setPage(current); + gridResult.setRecords(vlogPage.getTotal()); + gridResult.setTotal(vlogPage.getPages()); + return gridResult; } @Transactional(rollbackFor = Exception.class) @@ -393,8 +414,38 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { queryWrapper.eq(MyLikedVlog::getUserId, bo.getUserId()); Page likedPage = myLikedVlogMapper.selectPage(pageParam, queryWrapper); List likedList = likedPage.getRecords(); - // TODO: 组装PagedGridResult返回 - return null; + // 组装返回的 VO 列表 + String uid = bo.getUserId(); + if (StringUtils.isBlank(uid)) { + LoginUser user = LoginHelper.getLoginUser(); + uid = user != null ? String.valueOf(user.getUserId()) : null; + } + final String finalUid = uid; + + List voList = likedList.stream() + .map(liked -> { + Vlog vlog = vlogMapper.selectById(liked.getVlogId()); + if (vlog == null) { + return null; + } + IndexVlogVO vo = vlogConvert.toVO(vlog); + if (StringUtils.isNotBlank(finalUid)) { + vo.setDoIFollowVloger(fansService.queryDoIFollowVloger(finalUid, vlog.getVlogerId())); + vo.setDoILikeThisVlog(true); + } + vo.setLikeCounts(getVlogBeLikedCounts(vlog.getId())); + vo.setCommentsCounts(getVlogComment(vlog.getId())); + return vo; + }) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + PagedGridResult gridResult = new PagedGridResult(); + gridResult.setRows(voList); + gridResult.setPage(current); + gridResult.setRecords(likedPage.getTotal()); + gridResult.setTotal(likedPage.getPages()); + return gridResult; } @Override @@ -445,8 +496,17 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { int likeCounts = myLikedVlogMapper.countLikesByVlogId(vlog.getId()); result.put("likeCounts", likeCounts); - // 评论数 - Integer commentCount = commentMapper.countByVlogId(vlog.getId()); + // 评论数：优先 Redis，无则 MySQL + String commentCountStr = redis.get(REDIS_VLOG_COMMENT_COUNTS + ":" + vlog.getId()); + Integer commentCount = 0; + if (StringUtils.isNotBlank(commentCountStr)) { + commentCount = Integer.valueOf(commentCountStr); + } else { + commentCount = commentMapper.countByVlogId(vlog.getId()); + if (commentCount != null) { + redis.set(REDIS_VLOG_COMMENT_COUNTS + ":" + vlog.getId(), String.valueOf(commentCount)); + } + } result.put("commentCounts", commentCount); // 获取粉丝数量：优先 Redis，无则 MySQL @@ -486,7 +546,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { // } else { // result.put("vodDetail", vodDetail); // } - + IndexVlogVO vo = vlogConvert.toVO(vlog); // 添加评论信息 List> comments = commentMapper.selectCommentsByVlogId(vlog.getId()); result.put("comments", comments); @@ -498,6 +558,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { List> likedUsers = myLikedVlogMapper.selectLikedUsersByVlogId(vlog.getId()); result.put("likedUsers", likedUsers); + result.put("vlog",vo); // 添加粉丝列表 // Page fansPage = fansService.queryMyFans(vlog.getVlogerId(), 0, 10); @@ -618,16 +679,16 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { // 查询所有公开的视频列表 List> allVlogs = vlogMapper.selectAllPublicVlogs(); - + if (allVlogs != null && !allVlogs.isEmpty()) { // 从Redis获取每个视频的点赞数量 List> vlogsWithLikeCounts = new ArrayList<>(); - + for (Map vlog : allVlogs) { String vlogId = vlog.get("id").toString(); String redisLikeKey = REDIS_VLOG_BE_LIKED_COUNTS + ":" + vlogId; String likeCountStr = redis.get(redisLikeKey); - + // 获取Redis中的点赞数，如果没有则使用数据库中的默认值 int likeCount = 0; if (likeCountStr != null && !likeCountStr.isEmpty()) { @@ -638,22 +699,22 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { likeCount = 0; } } - + // 添加Redis中的点赞数到视频信息中 vlog.put("redis_like_count", likeCount); vlogsWithLikeCounts.add(vlog); } - + // 先打乱顺序 Collections.shuffle(vlogsWithLikeCounts); - + // 按Redis中的点赞数排序，获取前limit个 vlogsWithLikeCounts.sort((v1, v2) -> { int count1 = (Integer) v1.get("redis_like_count"); int count2 = (Integer) v2.get("redis_like_count"); return Integer.compare(count2, count1); // 降序排列 }); - + // 取前limit个 List> topLikedVlogs = vlogsWithLikeCounts.stream() .limit(limit) diff --git a/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MessageRepository.xml b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MessageRepository.xml new file mode 100644 index 000000000..8db1d8235 --- /dev/null +++ b/ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/MessageRepository.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO t_message + ( + id, + from_user_id, + from_nickname, + from_face, + to_user_id, + msg_type, + msg_content, + create_time + ) + VALUES + ( + IFNULL(#{id}, REPLACE(UUID(),'-','')), + #{fromUserId}, + #{fromNickname}, + #{fromFace}, + #{toUserId}, + #{msgType}, + #{msgContent, jdbcType=LONGVARCHAR, typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler}, + #{createTime} + ) + + + + + + + + diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountChangeRecordBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountChangeRecordBO.java index 286a68be2..cc1b3537c 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountChangeRecordBO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberAccountChangeRecordBO.java @@ -27,7 +27,8 @@ public class MemberAccountChangeRecordBO extends BaseBO implements IF @Override public boolean queryDoIFollowVloger(String myId, String vloggerId) { - Fans vlogger = queryFansRelationship(Long.valueOf(myId), Long.valueOf(vloggerId)); - return vlogger != null; + try { + // Try to convert string IDs to Long if they are numeric + if (myId != null && vloggerId != null && + myId.matches("\\d+") && vloggerId.matches("\\d+")) { + Fans vlogger = queryFansRelationship(Long.valueOf(myId), Long.valueOf(vloggerId)); + return vlogger != null; + } else { + // If IDs contain non-numeric characters, return false for now + // This prevents the NumberFormatException + log.warn("Cannot convert string IDs to Long: myId={}, vloggerId={}", myId, vloggerId); + return false; + } + } catch (NumberFormatException e) { + log.warn("Failed to convert string IDs to Long: myId={}, vloggerId={}", myId, vloggerId, e); + return false; + } } @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java index 78df412f5..af10602bf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantAccountController.java @@ -35,10 +35,9 @@ public class SysTenantAccountController { @Operation(summary = "查询租户账户列表") @PostMapping("/list") - public R> fansList(@RequestBody SysTenantAccountBo bo, @RequestBody Page page) { - LambdaQueryWrapper fansQuery = new LambdaQueryWrapper<>(); - Page fans = service.page(page, fansQuery); - return R.ok(convert.toVO(fans)); + public R> fansList(@RequestBody SysTenantAccountBo bo, Page page) { + IPage result = service.selectTenantAccountPage(page, bo); + return R.ok(result); } @Operation(summary = "导出租户账户列表") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java index 6ce77f591..5da427583 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantAccountBo.java @@ -17,18 +17,18 @@ public class SysTenantAccountBo extends BaseAudit { private Long id; @Schema(description = "租户ID") private Long tenantId; - @Schema(description = "现金余额") - private BigDecimal moneyBalance; + @Schema(description = "积分余额") + private BigDecimal integralBalance; + @Schema(description = "钱包余额") private BigDecimal wallet; - @Schema(description = "累计收益") + @Schema(description = "营收") private BigDecimal revenue; - @Schema(description = "创建人") - private Long createBy; - @Schema(description = "更新人") + private Long updateBy; @Schema(description = "账户类型 1商家 2代理 3平台") private Integer type; + private String storeName; public LambdaQueryWrapper toWrapper() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java index 549f2512e..cdabb5493 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantAccountVo.java @@ -12,12 +12,16 @@ public class SysTenantAccountVo { private Long id; @Schema(description = "租户ID") private Long tenantId; + @Schema(description = "积分余额") + private BigDecimal integralBalance; +// @Schema(description = "累计积分余额") +// private BigDecimal totalIntegralBalance; @Schema(description = "更新时间") private Date updateTime; @Schema(description = "创建时间") private Date createTime; - @Schema(description = "现金余额") - private BigDecimal moneyBalance; +// @Schema(description = "现金余额") +// private BigDecimal moneyBalance; @Schema(description = "钱包余额") private BigDecimal wallet; @Schema(description = "累计收益") @@ -28,4 +32,8 @@ public class SysTenantAccountVo { private Long updateBy; @Schema(description = "账户类型 1商家 2代理 3平台") private Integer type; + @Schema(description = "店铺名称") + private String storeName; + @Schema(description = "店铺名称") + private String companyName; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java index 65fc873d5..229889eb2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantAccountMapper.java @@ -1,13 +1,22 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.CommissionSection; import org.dromara.system.domain.SysTenantAccount; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.system.domain.bo.SysTenantAccountBo; import org.dromara.system.domain.vo.CommissionSectionVo; import org.dromara.system.domain.vo.SysTenantAccountVo; @Mapper public interface SysTenantAccountMapper extends BaseMapperPlus { + + /** + * 分页查询租户账户列表（关联租户表获取店铺名称） + */ + IPage selectTenantAccountPage(Page page, @Param("bo") SysTenantAccountBo bo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java index bd855e3c8..00a4abf8e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantAccountService.java @@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.system.domain.CommissionSection; import org.dromara.system.domain.SysTenantAccount; import org.dromara.system.domain.bo.SysTenantAccountBo; +import org.dromara.system.domain.vo.SysTenantAccountVo; import java.util.List; public interface ISysTenantAccountService extends IService { IPage pageWithTenant(Page page, SysTenantAccountBo bo); + IPage selectTenantAccountPage(Page page, SysTenantAccountBo bo); List list(SysTenantAccountBo bo); SysTenantAccount getById(Long id); boolean save(SysTenantAccount po); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java index a51a7f48b..e0251519f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantAccountServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import org.dromara.system.domain.SysTenantAccount; import org.dromara.system.domain.bo.SysTenantAccountBo; +import org.dromara.system.domain.vo.SysTenantAccountVo; import org.dromara.system.mapper.SysTenantAccountMapper; import org.dromara.system.service.ISysTenantAccountService; import org.springframework.stereotype.Service; @@ -24,6 +25,11 @@ public class SysTenantAccountServiceImpl extends ServiceImpl selectTenantAccountPage(Page page, SysTenantAccountBo bo) { + return mapper.selectTenantAccountPage(page, bo); + } + @Override public List list(SysTenantAccountBo bo) { LambdaQueryWrapper wrapper = buildWrapper(bo); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml new file mode 100644 index 000000000..e308bc394 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantAccountMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java index 25c55c31a..64845cbe7 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/DivideController.java @@ -29,7 +29,7 @@ public class DivideController { @Tag(name = "查询列表") @PostMapping("/list") - public R> list(@RequestBody DivideBO bo, @RequestBody Page page) { + public R> slist(@RequestBody DivideBO bo, @RequestBody Page page) { Page pages = service.page(page, bo.toWrapper()); return R.ok(convert.toVO(pages)); }