提交接口

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOutApiService.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 评价管理好办接口
+ * 评价管理小程序接口
  * @Description:
  * @author zhiwj
  * @date 2019-12-27 9:20

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java

@@ -269,20 +269,14 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         evaluateQO.setPageSize(pageSize);
         evaluateQO.setApplet(1);
 
-        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
-        Integer orderType = evaluateOrderConfig.getOrderType();
-        evaluateQO.setOrderByField(orderType);
-        // 查询置顶的
+//        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
+//        Integer orderType = evaluateOrderConfig.getOrderType();
+//        evaluateQO.setOrderByField(orderType);
+
         com.github.pagehelper.Page<TabEvaluate> topHotEvaluate = evaluateService.listEvaluateNearByStore(evaluateQO);
         if (CollectionUtils.isEmpty(topHotEvaluate)) {
             topHotEvaluate = new com.github.pagehelper.Page<>();
         }
-//        // 查询非置顶的
-//        evaluateQO.setTopHotStatus();
-//        List<TabEvaluate> listEvaluate = evaluateService.listEvaluateNearByStore(evaluateQO);
-//        if (CollectionUtils.isNotEmpty(listEvaluate)) {
-//            topHotEvaluate.addAll(listEvaluate);
-//        }
 
         Page<EvaluateDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(topHotEvaluate, EvaluateDTO.class);
         List<EvaluateDTO> resultList = resultPage.getResult();
@@ -291,20 +285,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             List<TabEvaluateImg> evaluateImgList = evaluateImgService.listImageByEvaluateId(evaluateDTO.getEvaluateId());
             List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
             evaluateDTO.setImgList(imgList);
-
-//            double avgScore = this.getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
-//            evaluateDTO.setAvgScore(avgScore);
-
-/*            // 追评和回复
-            List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
-            List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
-            // 追评和回复的图片
-            for (EvaluateReplyDTO replyDTO : replyDTOList) {
-                List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
-                List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
-                replyDTO.setImgList(replyImgList);
-            }
-            evaluateDTO.setReplyList(replyDTOList);*/
         }
 
         return EnterpriseServiceResponse.success(resultPage);
@@ -312,46 +292,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
     @Override
     public ServiceResponse<Page<EvaluateDTO>> getFirstEvaluateByStore(Integer enterpriseId, Integer storeId) {
-        EvaluateQO evaluateQO = new EvaluateQO();
-        evaluateQO.setEnterpriseId(enterpriseId);
-        //        evaluateQO.setMemberId(evaluateOutQO.getMemberId());
-        evaluateQO.setStoreIdList(Collections.singletonList(storeId));
-        evaluateQO.setShowStatus(Constants.OPEN);
-        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)) {
-            topHotEvaluate = new com.github.pagehelper.Page<>();
-        }
-
-//        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
-        Page<EvaluateDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(topHotEvaluate, EvaluateDTO.class);
-        List<EvaluateDTO> resultList = resultPage.getResult();
-        for (EvaluateDTO evaluateDTO : resultList) {
-
-            List<TabEvaluateImg> evaluateImgList = evaluateImgService.listImageByEvaluateId(evaluateDTO.getEvaluateId());
-            List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
-            evaluateDTO.setImgList(imgList);
-
-//            double avgScore = this.getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
-//            evaluateDTO.setAvgScore(avgScore);
-
-/*            // 追评和回复
-            List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
-            List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
-            // 追评和回复的图片
-            for (EvaluateReplyDTO replyDTO : replyDTOList) {
-                List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
-                List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
-                replyDTO.setImgList(replyImgList);
-            }
-            evaluateDTO.setReplyList(replyDTOList);*/
-        }
-
-        return EnterpriseServiceResponse.success(resultPage);
+        return listEvaluateByStore(enterpriseId, storeId, 1, 1);
     }
 
     private boolean overEvaluateTime(TabEvaluateOrderConfig evaluateOrderConfig, Date receiptsDate) {

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -590,22 +590,22 @@
     <include refid="Base_Column_List" />
     from tab_evaluate
     <include refid="querySql" />
-    <if test="orderByField != null ">
+<!--    <if test="orderByField != null ">
       <if test="orderByField == 1 ">
         order by top_hot_status DESC, avg_score
       </if>
       <if test="orderByField == 2 ">
         order by top_hot_status DESC, evaluate_time DESC
       </if>
-    </if>
-    <if test="orderByField == null ">
+    </if>-->
+<!--    <if test="orderByField == null ">-->
         <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>
+<!--    </if>-->
   </select>
   <select id="countEvaluate" resultType="int">
     select