From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
index 2366b45..b23259a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -140,13 +140,13 @@
         // 统计有图,好评,中差评数量
         long imgUrlCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
                 .isNotNull(TOrderEvaluate::getImgUrl));
-        packageTagCount(imgUrlCount,"有图",tagList);
+        packageTagCount(imgUrlCount,"有图",2,tagList);
         long goodCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
                 .ge(TOrderEvaluate::getMark,4));
-        packageTagCount(goodCount,"好评",tagList);
+        packageTagCount(goodCount,"好评",3,tagList);
         long badCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
                 .le(TOrderEvaluate::getMark,3));
-        packageTagCount(badCount,"中差评",tagList);
+        packageTagCount(badCount,"中差评",4,tagList);
         return tagList;
     }
 
@@ -219,11 +219,12 @@
      * @param name
      * @param tagList
      */
-    private void packageTagCount(Long count,String name,List<TEvaluationTagVO> tagList){
+    private void packageTagCount(Long count,String name,Integer type,List<TEvaluationTagVO> tagList){
         if(count>0){
             TEvaluationTagVO evaluationTagVO = new TEvaluationTagVO();
             evaluationTagVO.setName(name);
             evaluationTagVO.setTagCount(Integer.parseInt(String.valueOf(count)));
+            evaluationTagVO.setType(type);
             tagList.add(evaluationTagVO);
         }
     }

--
Gitblit v1.7.1