diff --git a/app/Customer.php b/app/Customer.php index 981f758..bf54bd1 100644 --- a/app/Customer.php +++ b/app/Customer.php @@ -120,6 +120,11 @@ class Customer extends Authenticatable implements JWTSubject return $this->hasMany(Balance::class, "customer_id"); } + public function oneBalance() + { + return $this->hasOne(Balance::class, "customer_id"); + } + public function recharges() { return $this->hasMany(Recharge::class, "customer_id")->whereNotNull("paid_at"); diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index 968f673..7bdaae5 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -255,11 +255,12 @@ class StatisticsController extends CommonController DB::enableQueryLog(); //todo:子订单的数量增加,用更省查询时间的方式获取项目相关数据 $customers = (new Customer()) + ->whereNull("deleted_at") ->with([ "patients" => function ($query) use ($before_datetime) { $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc"); }, - "balances" => function ($query) use ($before_datetime) { + "oneBalance" => function ($query) use ($before_datetime) { $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc"); } ]) diff --git a/resources/views/admin/statistics/customer-balance.blade.php b/resources/views/admin/statistics/customer-balance.blade.php index 2e84a79..4d66d8d 100755 --- a/resources/views/admin/statistics/customer-balance.blade.php +++ b/resources/views/admin/statistics/customer-balance.blade.php @@ -35,35 +35,25 @@