diff --git a/app/Admin/Metrics/Examples/FullPaymentRate.php b/app/Admin/Metrics/Examples/FullPaymentRate.php index afcae76..5b8f373 100644 --- a/app/Admin/Metrics/Examples/FullPaymentRate.php +++ b/app/Admin/Metrics/Examples/FullPaymentRate.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\UsersMember; use Dcat\Admin\Widgets\Metrics\Card; @@ -51,12 +52,12 @@ class FullPaymentRate extends Card ])->first(); //当前年份已完成二级学院扫码的学生(实际报道人数) - $allCount = CompletedOfflineStep::query()->where([ + /*$allCount = CompletedOfflineStep::query()->where([ "annual_session" => $config->data, ])->select("unique_number")->distinct()->get()->toArray(); if(!empty($allCount)){ $number = count($allCount); - } + }*/ @@ -83,6 +84,14 @@ class FullPaymentRate extends Card $studentsNum = count($paymentList); + //已缴费人数 + $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)){ + $number = count($payNum); + } } }