From 852b3e7755d2ca54a79bfa51f0841970e2be55ac Mon Sep 17 00:00:00 2001
From: zlg <482370576@qq.com>
Date: Tue, 23 Jul 2024 16:43:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=82=B9=E8=B5=9E=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share/mq/comment/CommentLikesConsumer.java      |  1 +
 ...SchisandraUserLikesCommentDomainServiceImpl.java |  2 +-
 .../SchisandraUserLikesDetailDomainServiceImpl.java |  2 +-
 .../service/SchisandraUserLikesCommentService.java  |  2 +-
 .../service/SchisandraUserLikesDetailService.java   |  2 +-
 .../impl/SchisandraUserLikesCommentServiceImpl.java | 13 +++++--------
 .../impl/SchisandraUserLikesDetailServiceImpl.java  | 12 ++++--------
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-mq/src/main/java/com/schisandra/share/mq/comment/CommentLikesConsumer.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-mq/src/main/java/com/schisandra/share/mq/comment/CommentLikesConsumer.java
index dacf2f9..53453b2 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-mq/src/main/java/com/schisandra/share/mq/comment/CommentLikesConsumer.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-mq/src/main/java/com/schisandra/share/mq/comment/CommentLikesConsumer.java
@@ -27,6 +27,7 @@ public class CommentLikesConsumer implements RocketMQListener<SchisandraUserLike
     public void onMessage(SchisandraUserLikesCommentBO message) {
         log.info("收到消息：{}", message);
         String id = message.getCommentId();
+        String userId=message.getUserId();
         Boolean likes = message.getLike();
         schisandraShareCommentReplyDomainService.updateCommentsLikes(id, likes);
         if (likes) {
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesCommentDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesCommentDomainServiceImpl.java
index a04630e..b0c70d1 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesCommentDomainServiceImpl.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesCommentDomainServiceImpl.java
@@ -47,7 +47,7 @@ public class SchisandraUserLikesCommentDomainServiceImpl implements SchisandraUs
 
     @Override
     public Boolean deleteReal(SchisandraUserLikesCommentBO schisandraUserLikesCommentBO) {
-        return schisandraUserLikesCommentService.deleteById(schisandraUserLikesCommentBO.getId());
+        return schisandraUserLikesCommentService.deleteById(schisandraUserLikesCommentBO.getUserId(),schisandraUserLikesCommentBO.getCommentId());
     }
 
 
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesDetailDomainServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesDetailDomainServiceImpl.java
index 9afce23..012f66f 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesDetailDomainServiceImpl.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesDetailDomainServiceImpl.java
@@ -47,7 +47,7 @@ public class SchisandraUserLikesDetailDomainServiceImpl implements SchisandraUse
 
     @Override
     public Boolean deleteReal(SchisandraUserLikesDetailBO schisandraUserLikesDetailBO) {
-        return schisandraUserLikesDetailService.deleteById(schisandraUserLikesDetailBO.getId());
+        return schisandraUserLikesDetailService.deleteById(schisandraUserLikesDetailBO.getUserId(),schisandraUserLikesDetailBO.getDetailId());
     }
 
 }
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java
index 3a33cab..0ea38b0 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesCommentService.java
@@ -40,7 +40,7 @@ public interface SchisandraUserLikesCommentService {
      * @param id 主键
      * @return 是否成功
      */
-    boolean deleteById(String id);
+    boolean deleteById(String userId,String commentId);
 
     SchisandraUserLikesComment queryByuserIdAndCommentId(String commentId, String userId);
 }
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesDetailService.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesDetailService.java
index 0fcabcc..3cc4cec 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesDetailService.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraUserLikesDetailService.java
@@ -40,7 +40,7 @@ public interface SchisandraUserLikesDetailService {
      * @param id 主键
      * @return 是否成功
      */
-    boolean deleteById(String id);
+    boolean deleteById(String userId,String detailId);
 
     SchisandraUserLikesDetail selectLike(String Id,String userId);
 
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java
index aa50a96..e8c63d9 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java
@@ -54,15 +54,12 @@ public class SchisandraUserLikesCommentServiceImpl implements SchisandraUserLike
         return this.schisandraUserLikesCommentDao.update(schisandraUserLikesComment,true);
     }
 
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
+
     @Override
-    public boolean deleteById(String id) {
-        return this.schisandraUserLikesCommentDao.deleteById(id) > 0;
+    public boolean deleteById(String userId,String commentId) {
+        return this.schisandraUserLikesCommentDao.deleteByCondition(
+                SchisandraUserLikesCommentTableDef.SCHISANDRA_USER_LIKES_COMMENT.COMMENT_ID.eq(commentId)
+                .and(SchisandraUserLikesCommentTableDef.SCHISANDRA_USER_LIKES_COMMENT.USER_ID.eq(userId))) > 0;
     }
 
     @Override
diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesDetailServiceImpl.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesDetailServiceImpl.java
index 01d0aea..7fbea34 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesDetailServiceImpl.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesDetailServiceImpl.java
@@ -54,15 +54,11 @@ public class SchisandraUserLikesDetailServiceImpl implements SchisandraUserLikes
         return this.schisandraUserLikesDetailDao.update(schisandraUserLikesDetail,true);
     }
 
-    /**
-     * 通过主键删除数据
-     *
-     * @param id 主键
-     * @return 是否成功
-     */
+
     @Override
-    public boolean deleteById(String id) {
-        return this.schisandraUserLikesDetailDao.deleteById(id) > 0;
+    public boolean deleteById(String userId,String detailId) {
+        return this.schisandraUserLikesDetailDao.deleteByCondition(SchisandraUserLikesDetailTableDef.SCHISANDRA_USER_LIKES_DETAIL.USER_ID.eq(userId)
+                .and(SchisandraUserLikesDetailTableDef.SCHISANDRA_USER_LIKES_DETAIL.DETAIL_ID.eq(detailId))) > 0;
     }
 
     @Override