Merge remote-tracking branch 'refs/remotes/origin/dev'

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

@@ -29,7 +29,12 @@ public class CommentLikesConsumer implements RocketMQListener<SchisandraUserLike
         String id = message.getCommentId();
         Boolean likes = message.getLike();
         schisandraShareCommentReplyDomainService.updateCommentsLikes(id, likes);
-        schisandraUserLikesCommentDomainService.add(message);
+        if (likes) {
+            schisandraUserLikesCommentDomainService.add(message);
+        }else {
+            schisandraUserLikesCommentDomainService.deleteReal(message);
+        }
+
     }
 
 

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-mq/src/main/java/com/schisandra/share/mq/comment/DetailLikesConsumer.java

@@ -27,6 +27,11 @@ public class DetailLikesConsumer implements RocketMQListener<SchisandraUserLikes
         String id = message.getDetailId();
         Boolean likes = message.getLike();
         schisandraShareDetailDomainService.updateDetailLikes(id, likes);
-        schisandraUserLikesDetailDomainService.add(message);
+        if (likes) {
+            schisandraUserLikesDetailDomainService.add(message);
+        }else {
+             schisandraUserLikesDetailDomainService.deleteReal(message);
+        }
+
     }
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraUserLikesCommentDomainService.java

@@ -25,4 +25,6 @@ public interface SchisandraUserLikesCommentDomainService {
      */
     Boolean delete(SchisandraUserLikesCommentBO schisandraUserLikesCommentBO);
 
+    Boolean deleteReal(SchisandraUserLikesCommentBO schisandraUserLikesCommentBO);
+
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraUserLikesDetailDomainService.java

@@ -25,4 +25,6 @@ public interface SchisandraUserLikesDetailDomainService {
      */
     Boolean delete(SchisandraUserLikesDetailBO schisandraUserLikesDetailBO);
 
+    Boolean deleteReal(SchisandraUserLikesDetailBO schisandraUserLikesDetailBO);
+
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesCommentDomainServiceImpl.java

@@ -45,4 +45,10 @@ public class SchisandraUserLikesCommentDomainServiceImpl implements SchisandraUs
         return schisandraUserLikesCommentService.update(schisandraUserLikesComment) > 0;
     }
 
+    @Override
+    public Boolean deleteReal(SchisandraUserLikesCommentBO schisandraUserLikesCommentBO) {
+        return schisandraUserLikesCommentService.deleteById(schisandraUserLikesCommentBO.getId());
+    }
+
+
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraUserLikesDetailDomainServiceImpl.java

@@ -45,4 +45,9 @@ public class SchisandraUserLikesDetailDomainServiceImpl implements SchisandraUse
         return schisandraUserLikesDetailService.update(schisandraUserLikesDetail) > 0;
     }
 
+    @Override
+    public Boolean deleteReal(SchisandraUserLikesDetailBO schisandraUserLikesDetailBO) {
+        return schisandraUserLikesDetailService.deleteById(schisandraUserLikesDetailBO.getId());
+    }
+
 }

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(Long id);
+    boolean deleteById(String id);
 
     SchisandraUserLikesComment queryByuserIdAndCommentId(String commentId, String userId);
 }

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(Long id);
+    boolean deleteById(String id);
 
     SchisandraUserLikesDetail selectLike(String Id,String userId);
 

schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesCommentServiceImpl.java

@@ -61,7 +61,7 @@ public class SchisandraUserLikesCommentServiceImpl implements SchisandraUserLike
      * @return 是否成功
      */
     @Override
-    public boolean deleteById(Long id) {
+    public boolean deleteById(String id) {
         return this.schisandraUserLikesCommentDao.deleteById(id) > 0;
     }
 

schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraUserLikesDetailServiceImpl.java

@@ -61,7 +61,7 @@ public class SchisandraUserLikesDetailServiceImpl implements SchisandraUserLikes
      * @return 是否成功
      */
     @Override
-    public boolean deleteById(Long id) {
+    public boolean deleteById(String id) {
         return this.schisandraUserLikesDetailDao.deleteById(id) > 0;
     }