From 6f846284806e47fac7c2a4a9658473f7f8e9945b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 12:10:23 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
index 2c52b88..6512e54 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
@@ -1,7 +1,10 @@
 package com.doumee.service.business.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.listener.event.IntegralEvent;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -23,11 +26,6 @@
 import com.doumee.dao.web.dto.activity.ActivityReplyCommentDTO;
 import com.doumee.dao.web.request.CommentApplyRequest;
 import com.doumee.service.business.CommentService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.MemberService;
 import com.doumee.service.business.ZanService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.collections4.MapUtils;
@@ -84,16 +82,22 @@
         target.setType(Constants.ZERO);
 
         if (comment.getReplyId() != null){
-            Comment reply = commentMapper.selectById(comment.getReplyId());
+            Comment reply = commentMapper.selectJoinOne(Comment.class,new MPJLambdaWrapper<Comment>()
+                    .selectAll(Comment.class)
+                    .selectAs(Member::getNickname,Comment::getReplyMemberNikeName)
+                    .leftJoin(Member.class,Member::getId,Comment::getMemberId)
+                    .eq(Comment::getId,comment.getReplyId())
+            );
             reply = Optional.ofNullable(reply).orElseThrow(() -> new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍥炲鐩爣涓嶅瓨鍦�"));
             target.setReplyId(reply.getId());
             target.setReplyMemberId(reply.getMemberId());
+            target.setReplyMemberNikeName(reply.getReplyMemberNikeName());
             target.setCommentId(reply.getId());
             target.setCommentMemberId(reply.getMemberId());
             target.setType(Constants.ONE);
-        }
-
-        if (comment.getCommentId() != null ){
+            target.setCommentId(reply.getCommentId());
+            target.setCommentMemberId(reply.getCommentMemberId());
+        }else if (comment.getCommentId() != null ){
             Comment reply = commentMapper.selectById(comment.getCommentId());
             reply = Optional.ofNullable(reply).orElseThrow(() -> new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "涓�绾ц瘎璁虹洰鏍囦笉瀛樺湪"));
             target.setCommentId(reply.getCommentId());
@@ -124,8 +128,6 @@
                 target.setMemberImgUrl(memberFile + member.getImgurl());
             }
         }
-        IntegralEvent<Comment> integralEvent = new IntegralEvent(this,target, Constants.CoffeeBeanTask.POST_COMMENTS,memberId);
-        applicationEventPublisher.publishEvent(integralEvent);
         target.setZanCount(Constants.ZERO);
         target.setZanStatus(Constants.ZERO);
         return target;
@@ -189,7 +191,7 @@
         QueryWrapper<Comment> wrapper = new QueryWrapper<>(comment);
         return commentMapper.selectList(wrapper);
     }
-  
+
     @Override
     public PageData<Comment> findPage(PageWrap<Comment> pageWrap) {
         IPage<Comment> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -273,6 +275,7 @@
         replyWrapper.eq(Comment::getType, Constants.ONE);
         replyWrapper.eq(Comment::getStatus, Constants.ZERO);
         replyWrapper.in(Comment::getCommentId,commentIds);
+        replyWrapper.orderByDesc(Comment::getId);
         replyWrapper.groupBy(Comment::getCommentId);
 
         List<ActivityReplyCommentDTO> activityCommentDTOS = commentJoinMapper.selectJoinList(ActivityReplyCommentDTO.class, replyWrapper);
@@ -339,6 +342,7 @@
         queryWrapper.eq(Comment::getType, Constants.ONE);
         queryWrapper.eq(Comment::getStatus, Constants.ZERO);
         queryWrapper.eq(Comment::getCommentId,pageWrap.getModel().getCommentId());
+        queryWrapper.orderByDesc(Comment::getId);
         IPage<ActivityReplyCommentDTO> result = commentJoinMapper.selectJoinPage(page, ActivityReplyCommentDTO.class, queryWrapper);
         if (CollectionUtils.isEmpty(result.getRecords())){
             return PageData.from(result);
@@ -372,7 +376,6 @@
                 s.setReplyMemberNikeName(null);
             }
         });
-
         return PageData.from(result);
     }
 }

--
Gitblit v1.9.3