Commit c2fa4f18 by zhiwj

修改bug

parent 66a827c1
......@@ -92,6 +92,11 @@ public class EvaluateQO extends PageQO{
private Integer[] evaluateIds;
private Long memberId;
/**
* 标志请求来自小程序
*/
private Integer applet;
public Integer getEnterpriseId() {
return enterpriseId;
}
......@@ -299,4 +304,12 @@ public class EvaluateQO extends PageQO{
public Long getMemberId() {
return memberId;
}
public Integer getApplet() {
return applet;
}
public void setApplet(Integer applet) {
this.applet = applet;
}
}
......@@ -266,6 +266,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
evaluateQO.setMaliciousStatus(Constants.CLOSE);
evaluateQO.setCurrentPage(currentPage);
evaluateQO.setPageSize(pageSize);
evaluateQO.setApplet(1);
TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
Integer orderType = evaluateOrderConfig.getOrderType();
......@@ -318,6 +319,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
evaluateQO.setMaliciousStatus(Constants.CLOSE);
evaluateQO.setCurrentPage(1);
evaluateQO.setPageSize(1);
evaluateQO.setApplet(1);
// 查询置顶的
com.github.pagehelper.Page<TabEvaluate> topHotEvaluate = evaluateService.listEvaluateNearByStore(evaluateQO);
if (CollectionUtils.isEmpty(topHotEvaluate)) {
......
......@@ -599,7 +599,12 @@
</if>
</if>
<if test="orderByField == null ">
order by top_hot_status DESC, evaluate_time desc
<if test="applet != null">
order by top_hot_status DESC, evaluate_time desc
</if>
<if test="applet == null">
order by evaluate_time desc
</if>
</if>
</select>
<select id="countEvaluate" resultType="int">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment