修改排序

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java

@@ -84,11 +84,6 @@ public class EvaluateQO extends PageQO{
     private Integer orderByField;
 
     /**
-     * 1:asc  2:desc
-     */
-    private Integer orderByType;
-
-    /**
      * 门店选择器d
      */
     private Integer storeWidgetId;
@@ -274,14 +269,6 @@ public class EvaluateQO extends PageQO{
         this.orderByField = orderByField;
     }
 
-    public Integer getOrderByType() {
-        return orderByType;
-    }
-
-    public void setOrderByType(Integer orderByType) {
-        this.orderByType = orderByType;
-    }
-
     public Integer getStoreWidgetId() {
         return storeWidgetId;
     }

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluate.java

@@ -52,6 +52,11 @@ public class TabEvaluate {
     private Integer serviceScore;
 
     /**
+     * 平均分
+     */
+    private Double avgScore;
+
+    /**
      * 首次评价之间
      */
     private Date evaluateTime;
@@ -268,6 +273,14 @@ public class TabEvaluate {
         this.serviceScore = serviceScore;
     }
 
+    public Double getAvgScore() {
+        return avgScore;
+    }
+
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
+
     public Date getEvaluateTime() {
         return evaluateTime;
     }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java

@@ -54,8 +54,6 @@ public class EvaluateServiceImpl implements EvaluateService {
     @Override
     public Page<TabEvaluate> listEvaluateNearByStore(EvaluateQO evaluateQO) {
         PageHelper.startPage(evaluateQO.getCurrentPage(), evaluateQO.getPageSize());
-        // 按附近门店排序
-        evaluateQO.setOrderByField(3);
         evaluateQO.setEndTime(DateUtil.dateToStr(DateUtil.getStartTimeOfDay(), DateUtil.FORMAT_DATETIME_19));
         return tabEvaluateMapper.listEvaluate(evaluateQO);
     }

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

@@ -145,6 +145,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             }
 
         }
+        // 计算平均分
+        double avgScore = getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
+        evaluateDTO.setAvgScore(avgScore);
 
         Integer evaluateId = evaluateService.saveEvaluate(evaluateDTO);
 
@@ -236,6 +239,10 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         evaluateQO.setMaliciousStatus(Constants.CLOSE);
         evaluateQO.setCurrentPage(currentPage);
         evaluateQO.setPageSize(pageSize);
+
+        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)) {
@@ -247,7 +254,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 //        if (CollectionUtils.isNotEmpty(listEvaluate)) {
 //            topHotEvaluate.addAll(listEvaluate);
 //        }
-        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
+
         Page<EvaluateDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(topHotEvaluate, EvaluateDTO.class);
         List<EvaluateDTO> resultList = resultPage.getResult();
         for (EvaluateDTO evaluateDTO : resultList) {
@@ -256,8 +263,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             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);
+//            double avgScore = this.getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
+//            evaluateDTO.setAvgScore(avgScore);
 
 /*            // 追评和回复
             List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
@@ -290,7 +297,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             topHotEvaluate = new com.github.pagehelper.Page<>();
         }
 
-        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
+//        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
         Page<EvaluateDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(topHotEvaluate, EvaluateDTO.class);
         List<EvaluateDTO> resultList = resultPage.getResult();
         for (EvaluateDTO evaluateDTO : resultList) {
@@ -299,8 +306,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             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);
+//            double avgScore = this.getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
+//            evaluateDTO.setAvgScore(avgScore);
 
 /*            // 追评和回复
             List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());