From 133c15c42605d461d17ece79f89b0a2126c2382b Mon Sep 17 00:00:00 2001
From: cmz <phpreaper@163.com>
Date: Mon, 2 Sep 2024 17:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=9A=E4=BD=8D=E5=B0=8F=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Metrics/Chart/FullPaymentRateColumnCharts.php  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php b/app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php
index 100e9a5..548eea3 100644
--- a/app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php
+++ b/app/Admin/Metrics/Chart/FullPaymentRateColumnCharts.php
@@ -5,6 +5,7 @@ use App\Models\AdmissionNewStudents;
 use App\Models\CompletedOfflineStep;
 use App\Models\Config;
 use App\Models\OfflineStep;
+use App\Models\Order;
 use App\Models\PaymentList;
 use App\Models\SecondaryCollege;
 use App\Models\Speciality;
@@ -77,9 +78,18 @@ class FullPaymentRateColumnCharts extends Chart
                         $userList = array_column($userList, "unique_number");
 
                         //线下迎新有几步
-                        $stepCount = OfflineStep::query()->where("status", OfflineStep::STATUS_YES)->count();
+                        /*$stepCount = OfflineStep::query()->where("status", OfflineStep::STATUS_YES)->count();
                         //检测是否存在线下报到步骤，存在则视为已到校(实际报到学生)
-                        $completedOfflineStep = CompletedOfflineStep::query()->whereIn("unique_number", $userList)->where("annual_session", $config->data)->where("step_id",">=",$stepCount)->count();
+                        $completedOfflineStep = CompletedOfflineStep::query()->whereIn("unique_number", $userList)->where("annual_session", $config->data)->where("step_id",">=",$stepCount)->count();*/
+
+                        //已缴费人数
+                        $payNum = Order::query()->whereIn("unique_number", $userList)->where([
+                            "status" => Order::STATUS_PAID,
+                            "annual_session" => $config->data,
+                        ])->select("unique_number")->groupBy('unique_number')->get()->toArray();
+                        if(!empty($payNum)){
+                            $completedOfflineStep = count($payNum);
+                        }
 
                         //全额缴费人数
                         $paymentList = PaymentList::query()->where("annual_session", $config->data)