合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -444,15 +444,6 @@ public class SocialController extends BaseController {
         return response;
     }
 
-    @ApiOperation(value = "查询点赞次数", notes = "查询点赞次数")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "id", value = "帖子id")})
-    @RequestMapping(value = "/transactionLikeList/{id}", method = RequestMethod.GET)
-    public ResponseBean transactionLikeList(@PathVariable("id") Integer id,HttpSession session) {
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        ResponseBean transactionLike = socialServiceI.transactionLikeList(id,userElement);
-        return transactionLike;
-    }
-
     @ApiOperation(value = "添加点赞", notes = "添加点赞")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java

@@ -21,19 +21,17 @@ public interface TpTransactionLikeMapper {
      * 点赞
      * @param invitationId
      * @param communityId
-     * @param userId
      * @return
      */
-    Integer likeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
+    Integer likeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId);
 
     /**
      * 踩
      * @param invitationId
      * @param communityId
-     * @param userId
      * @return
      */
-    Integer nolikeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
+    Integer nolikeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId);
 
     /**
      * 查询当前人是否存在数据

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -44,6 +44,20 @@ public class TpTransaction {
 
     private  String roleName;
 
+    /**
+     * 顶赞的次数
+     */
+    private Integer likeCount;
+    /**
+     * 踩的人数
+     */
+    private Integer noLikeCount;
+
+    /**
+     * 是否已点赞或者踩
+     */
+    private Boolean bel;
+
 
     public String getRoleName() {
         return roleName;
@@ -186,4 +200,27 @@ public class TpTransaction {
         this.createUserName = createUserName;
     }
 
+    public Integer getLikeCount() {
+        return likeCount;
+    }
+
+    public void setLikeCount(Integer likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public Integer getNoLikeCount() {
+        return noLikeCount;
+    }
+
+    public void setNoLikeCount(Integer noLikeCount) {
+        this.noLikeCount = noLikeCount;
+    }
+
+    public Boolean getBel() {
+        return bel;
+    }
+
+    public void setBel(Boolean bel) {
+        this.bel = bel;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -187,14 +187,6 @@ public interface SocialServiceI {
 	 */
     ResponseBean addTransactionReply(String paramets, UserElement userElement);
 
-	/**
-	 * 查询表帖子的点赞次数
-	 * @param id
-	 * @param userElement
-	 * @return
-	 */
-	ResponseBean transactionLikeList(Integer id, UserElement userElement);
-
 	/**
 	 * 添加点赞
 	 * @param paramets

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -604,26 +604,6 @@ public class SocialServiceImpl implements SocialServiceI {
         return response;
     }
 
-    @Override
-    public ResponseBean transactionLikeList(Integer invitationId, UserElement userElement) {
-        ResponseBean response= new ResponseBean();
-        TpTransactionLike tpTransactionLike= new TpTransactionLike();
-        //统计点赞人数的次数
-        Integer likeCount= tpTransactionLikeMapper.likeCount(invitationId,userElement.getCommunityId(),userElement.getId());
-        //不喜欢的人数
-        Integer noLikeCount= tpTransactionLikeMapper.nolikeCount(invitationId,userElement.getCommunityId(),userElement.getId());
-
-        tpTransactionLike.setLikeCount(likeCount);
-        tpTransactionLike.setNoLikeCount(noLikeCount);
-        // 查看点前用户是否点赞或踩
-        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(invitationId,userElement.getCommunityId(),userElement.getId());
-        if (null!=isUser){
-            tpTransactionLike.setBel(false);
-        }
-        response.addSuccess(tpTransactionLike);
-        return response;
-    }
-
     @Override
     public ResponseBean addTransactionLike(String paramets, UserElement userElement) {
       ResponseBean response = new ResponseBean();
@@ -772,6 +752,25 @@ public class SocialServiceImpl implements SocialServiceI {
         List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
         tpTransaction.setImgList(imgList);
 
+        /**
+         * 查询点赞和踩的次数
+         */
+
+
+        //统计点赞人数的次数
+        Integer likeCount= tpTransactionLikeMapper.likeCount(activityId, communityId);
+        //不喜欢的人数
+        Integer noLikeCount= tpTransactionLikeMapper.nolikeCount(activityId, communityId);
+        tpTransaction.setLikeCount(likeCount == null ? 0 : likeCount);
+        tpTransaction.setNoLikeCount(noLikeCount == null ? 0 : noLikeCount);
+
+        // 默认没有点赞或者踩
+        tpTransaction.setBel(false);
+        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(activityId,communityId, userId);
+        if (null!=isUser){
+            tpTransaction.setBel(true);
+        }
+
         return tpTransaction;
 
     }

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml

@@ -118,8 +118,7 @@
     SELECT COUNT(transaction_id) FROM
     tp_transaction_like
     WHERE like_status = 1
-    and   community_id = #{communityId,jdbcType=INTEGER},
-    and   ta_user_id = #{userId,jdbcType=INTEGER},
+    and   community_id = #{communityId,jdbcType=INTEGER}
     and   transaction_id = #{invitationId,jdbcType=INTEGER}
   </select>
 
@@ -127,8 +126,7 @@
     SELECT COUNT(transaction_id) FROM
     tp_transaction_like
     WHERE like_status = 2
-    and   community_id = #{communityId,jdbcType=INTEGER},
-    and   ta_user_id = #{userId,jdbcType=INTEGER},
+    and   community_id = #{communityId,jdbcType=INTEGER}
     and   transaction_id = #{invitationId,jdbcType=INTEGER}
   </select>