From 257701e6cdf9f97b1ee272030aae9dc4925ee077 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Mon, 17 Apr 2023 16:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/OrderEvaluation.php      |  4 +++-
 app/Services/UserDoctorService.php | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Model/OrderEvaluation.php b/app/Model/OrderEvaluation.php
index 53e67df..b2b78e7 100644
--- a/app/Model/OrderEvaluation.php
+++ b/app/Model/OrderEvaluation.php
@@ -50,7 +50,7 @@ class OrderEvaluation extends Model
      */
     public static function getPage(array $params, array $fields = ["*"], int $page = null, ?int $per_page = 10): array
     {
-        $raw = self::where($params)->paginate($per_page, $fields, "page", $page);
+        $raw = self::where($params)->orderBy('created_at','desc')->paginate($per_page, $fields, "page", $page);
         $data = array();
         $data['current_page'] = $raw->currentPage();// 当前页码
         $data['total'] = $raw->total();//数据总数
@@ -74,7 +74,9 @@ class OrderEvaluation extends Model
     {
         $raw = self::where($params)
             ->whereBetween('avg_score',$avg_score_params)
+            ->orderBy('created_at','desc')
             ->paginate($per_page, $fields, "page", $page);
+
         $data = array();
         $data['current_page'] = $raw->currentPage();// 当前页码
         $data['total'] = $raw->total();//数据总数
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index 7a0cd28..81f024b 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -716,7 +716,7 @@ class UserDoctorService extends BaseService
             $avg_score_params = [80, 100];
         } elseif ($evaluation_type == 3) {
             // 中/差评
-            $avg_score_params = [0, 80];
+            $avg_score_params = [0, 79];
         } else {
             return fail();
         }
@@ -730,28 +730,28 @@ class UserDoctorService extends BaseService
         }
 
         // 获取其他类型评论总数
-        if ($evaluation_type != 1) {
+        if ($evaluation_type == 1) {
             // 好评
             $avg_score_params = [80, 100];
             $good_quantity = OrderEvaluation::getScoreCount($params, $avg_score_params);
 
             // 中/差评
-            $avg_score_params = [0, 80];
+            $avg_score_params = [0, 79];
             $bad_quantity = OrderEvaluation::getScoreCount($params, $avg_score_params);
         }
 
-        if ($evaluation_type != 2) {
+        if ($evaluation_type == 2) {
             // 全部+
             $avg_score_params = [0, 100];
             $total_quantity = OrderEvaluation::getScoreCount($params, $avg_score_params);
 
             // 中/差评
-            $avg_score_params = [0, 80];
+            $avg_score_params = [0, 79];
             $bad_quantity = OrderEvaluation::getScoreCount($params, $avg_score_params);
 
         }
 
-        if ($evaluation_type != 3) {
+        if ($evaluation_type == 3) {
             // 全部+
             $avg_score_params = [0, 100];
             $total_quantity = OrderEvaluation::getScoreCount($params, $avg_score_params);