评价

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -122,7 +122,7 @@ public class GicOrderController {
         }
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryType(1);
-        return this.orderListSelect(qdto, pageInfo);
+        return this.orderListSelect(qdto, pageInfo, false);
     }
 
     // 核销订单查询
@@ -138,10 +138,10 @@ public class GicOrderController {
         qdto.setOrderStep("" + status);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
-        return this.orderListSelect(qdto, pageInfo);
+        return this.orderListSelect(qdto, pageInfo, false);
     }
 
-    private RestResponse<Object> orderListSelect(ListOrderManageQDTO qdto, BasePageInfo pageInfo) {
+    private RestResponse<Object> orderListSelect(ListOrderManageQDTO qdto, BasePageInfo pageInfo, boolean evaluteFlag) {
         qdto.setPageNum(pageInfo.getPageNum());
         qdto.setPageSize(pageInfo.getPageSize());
         ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
@@ -164,26 +164,6 @@ public class GicOrderController {
             }
             Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
             String enterpriseId = qdto.getEnterpriseId();
-            // 评价
-            ServiceResponse<List<StoreEvaluateInfoDTO>> evaluateResp = evaluateDataApiService
-                    .getEvaluateScoreAndContent(enterpriseId, orderIdList);
-            Map<String, List<EvaluateVO>> evaluateMap = Optional.ofNullable(evaluateResp)
-                    .map(ServiceResponse::getResult).orElse(new ArrayList<>()).stream().map(data -> {
-                        EvaluateVO evaluateVO = new EvaluateVO();
-                        String evaluateContent = data.getEvaluateContent();
-                        evaluateVO.setEvaluateScoreList(new ArrayList<>());
-                        if (CollectionUtils.isNotEmpty(data.getEvaluateRuleScores())) {
-                            for (EvaluateRuleScoreDTO evaluateScoresDTO : data.getEvaluateRuleScores()) {
-                                EvaluateVO.EvaluateScore evaluateScore = new EvaluateVO.EvaluateScore();
-                                evaluateScore.setName(evaluateScoresDTO.getRuleName());
-                                evaluateScore.setValue(evaluateScoresDTO.getScore());
-                                evaluateVO.getEvaluateScoreList().add(evaluateScore);
-                            }
-                        }
-                        evaluateVO.setReviews(evaluateContent);
-                        evaluateVO.setOrderId(data.getOrderId());
-                        return evaluateVO;
-                    }).collect(Collectors.groupingBy(EvaluateVO::getOrderId));
             voList.forEach(item -> {
                 String clerkId = item.getBelongClerkId();
                 if (StringUtils.isNotEmpty(clerkId)) {
@@ -192,10 +172,35 @@ public class GicOrderController {
                         item.setBelongClerkName(clerkDTO.getClerkName());
                     }
                 }
-                if (null != evaluateMap.get(item.getOrderId())) {
-                    item.setEvaluateVO(evaluateMap.get(item.getOrderId()).get(0));
-                }
             });
+            // 评价
+            if (evaluteFlag) {
+                ServiceResponse<List<StoreEvaluateInfoDTO>> evaluateResp = evaluateDataApiService
+                        .getEvaluateScoreAndContent(enterpriseId, orderIdList);
+                Map<String, List<EvaluateVO>> evaluateMap = Optional.ofNullable(evaluateResp)
+                        .map(ServiceResponse::getResult).orElse(new ArrayList<>()).stream().map(data -> {
+                            EvaluateVO evaluateVO = new EvaluateVO();
+                            String evaluateContent = data.getEvaluateContent();
+                            evaluateVO.setEvaluateScoreList(new ArrayList<>());
+                            if (CollectionUtils.isNotEmpty(data.getEvaluateRuleScores())) {
+                                for (EvaluateRuleScoreDTO evaluateScoresDTO : data.getEvaluateRuleScores()) {
+                                    EvaluateVO.EvaluateScore evaluateScore = new EvaluateVO.EvaluateScore();
+                                    evaluateScore.setName(evaluateScoresDTO.getRuleName());
+                                    evaluateScore.setValue(evaluateScoresDTO.getScore());
+                                    evaluateVO.getEvaluateScoreList().add(evaluateScore);
+                                }
+                            }
+                            evaluateVO.setReviews(evaluateContent);
+                            evaluateVO.setOrderId(data.getOrderId());
+                            return evaluateVO;
+                        }).collect(Collectors.groupingBy(EvaluateVO::getOrderId));
+
+                voList.forEach(item -> {
+                    if (null != evaluateMap.get(item.getOrderId())) {
+                        item.setEvaluateVO(evaluateMap.get(item.getOrderId()).get(0));
+                    }
+                });
+            }
             retPage.setResult(voList);
             return RestResponse.successResult(retPage);
         }
@@ -428,7 +433,7 @@ public class GicOrderController {
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderParam(search);
         }
-        return this.orderListSelect(qdto, pageInfo);
+        return this.orderListSelect(qdto, pageInfo, true);
     }
 
     // 修改物流