评论排序调整

jpress-model/src/main/java/io/jpress/model/query/CommentQuery.java

@@ -52,7 +52,12 @@ public class CommentQuery extends JBaseQuery {
 		needWhere = appendIfNotEmpty(fromBuilder, " c.parent_id", parentCommentId, params, needWhere);
 		needWhere = appendIfNotEmpty(fromBuilder, " content.id", contentId, params, needWhere);
 
-		fromBuilder.append("order by c.created desc");
+		if ("uuhelper".equals(module)) {
+			//软文详情页评论排序，先按是否置顶排，再按点赞数排，最后按评论时间排。
+			fromBuilder.append("ORDER BY c.order_number desc,c.vote_up desc, c.created desc");
+		} else {
+			fromBuilder.append("order by c.created desc");
+		}
 
 		if (params.isEmpty()) {
 			return DAO.paginate(pageNumber, pageSize, select, fromBuilder.toString());
@@ -129,6 +134,10 @@ public class CommentQuery extends JBaseQuery {
 		return paginateWithContent(pageNumber, pageSize, null, null, contentId, null, Comment.STATUS_NORMAL);
 	}
 
+	public Page<Comment> uuHelperPaginateByContentId(int pageNumber, int pageSize, BigInteger contentId, String module) {
+		return paginateWithContent(pageNumber, pageSize, module, null, contentId, null, Comment.STATUS_NORMAL);
+	}
+
 	public long findCountByContentIdInNormal(BigInteger contentId) {
 		return findCountByContentId(contentId, Comment.STATUS_NORMAL);
 	}

jpress-web-core/src/main/java/io/jpress/ui/freemarker/tag/CommentPageTag.java

@@ -15,11 +15,8 @@
  */
 package io.jpress.ui.freemarker.tag;
 
-import javax.servlet.http.HttpServletRequest;
-
 import com.jfinal.core.JFinal;
 import com.jfinal.plugin.activerecord.Page;
-
 import io.jpress.core.render.freemarker.BasePaginateTag;
 import io.jpress.core.render.freemarker.JTag;
 import io.jpress.model.Comment;
@@ -27,6 +24,8 @@ import io.jpress.model.Content;
 import io.jpress.model.query.CommentQuery;
 import io.jpress.utils.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class CommentPageTag extends JTag {
 	
 	public static final String TAG_NAME = "jp.commentPage";
@@ -46,7 +45,12 @@ public class CommentPageTag extends JTag {
 
 		int pageSize = getParamToInt("pageSize", 10);
 
-		Page<Comment> page = CommentQuery.me().paginateByContentId(pageNumber, pageSize, content.getId());
+		Page<Comment> page;
+		if ("uuhelper".equals(content.getModule())) {
+			page = CommentQuery.me().uuHelperPaginateByContentId(pageNumber, pageSize, content.getId(), content.getModule());
+		} else {
+			page = CommentQuery.me().paginateByContentId(pageNumber, pageSize, content.getId());
+		}
 		setVariable("page", page);
 		setVariable("comments", page.getList());