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)