From 75d4942e9d6247f43315d893fb28e3c0c75b3586 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 31 Aug 2022 11:50:51 +0800
Subject: [PATCH] order-profit filter
---
.../Controllers/OrderProfitController.php | 39 ++++++++++++++++++-
app/Admin/Controllers/UserController.php | 10 +++--
app/Models/UserInfo.php | 5 +++
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/app/Admin/Controllers/OrderProfitController.php b/app/Admin/Controllers/OrderProfitController.php
index 003e6fa1..8909a209 100644
--- a/app/Admin/Controllers/OrderProfitController.php
+++ b/app/Admin/Controllers/OrderProfitController.php
@@ -10,6 +10,7 @@ use Dcat\Admin\Http\Controllers\AdminController;
use App\Admin\Extensions\Grid\Tools\ProfitBatchSuccess;
use App\Enums\PayWay;
use App\Models\Agent;
+use Carbon\Carbon;
use Dcat\Admin\Admin;
class OrderProfitController extends AdminController
@@ -27,7 +28,7 @@ class OrderProfitController extends AdminController
$grid->disableViewButton(false);
- $grid->column('order.sn');
+ $grid->column('order.sn')->link(fn() => admin_url('orders', ['id' => $this->order_id]));
$grid->column('fromUser.phone');
$grid->column('user.phone');
$grid->column('role_name');
@@ -46,6 +47,20 @@ class OrderProfitController extends AdminController
$filter->like('user.phone')->width(3);
$filter->equal('status')->select(OrderProfit::$statusMap)->width(3);
$filter->where('role_name', fn($q) => $q->role($this->input))->select(Agent::$typeMap)->width(3);
+ $filter->whereBetween('created_at', function ($q) {
+ $start = data_get($this->input, 'start');
+ $start = $start ? Carbon::createFromFormat('Y-m-d', $start) : null;
+ $end = data_get($this->input, 'end');
+ $end = $end ? Carbon::createFromFormat('Y-m-d', $end) : null;
+ if ($start) {
+ if ($end) {
+ $q->whereBetween('created_at', [$start, $end]);
+ }
+ $q->where('created_at', '>=', $start);
+ } else if ($end) {
+ $q->where('created_at', '<=', $end);
+ }
+ })->date()->width(6);
});
$grid->showRowSelector();
@@ -55,6 +70,28 @@ class OrderProfitController extends AdminController
$batch->add(new ProfitBatchSuccess());
}
});
+
+ $grid->footer(function ($collection) use ($grid) {
+ $query = OrderProfit::query();
+ $grid->model()->getQueries()->unique()->each(function ($value) use (&$query) {
+ if (in_array($value['method'], ['paginate', 'get', 'orderBy', 'orderByDesc'], true)) {
+ return;
+ }
+
+ $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
+ });
+ $money = number_format($query->sum('money'), 2);
+ return <<
+
+
+ | 统计 |
+ 收益金额: $money |
+
+
+
+ HTML;
+ });
});
}
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index f5f73203..4f6f8335 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -53,13 +53,13 @@ class UserController extends AdminController
});
});
$grid->column('userInfo.nickname')->display(function () {
- $avatar = $this->userInfo->avatar ? '
' : '';
- return $avatar . $this->userInfo->nickname;
+ $avatar = $this->userInfo?->avatar ? '
' : '';
+ return $avatar . $this->userInfo?->nickname;
});
$grid->column('phone')->copyable();
$grid->column('userInfo.code')->copyable();
$grid->column('userInfo.inviterInfo.user.phone')->display(function ($v) {
- return $v ?: $this->userInfo->inviter_id;
+ return $v ?: $this->userInfo?->inviter_id;
})->copyable();
$grid->column('userInfo.growth_value')->filter(
Grid\Column\Filter\Between::make()
@@ -121,6 +121,10 @@ class UserController extends AdminController
$filter->panel();
$filter->like('phone')->width(3);
$filter->like('userInfo.nickname')->width(3);
+ $filter->where('inviter_id', function ($q) {
+ $input = $this->input;
+ $q->whereHas('userInfo.inviter', fn($q1) => $q1->where('phone', 'like', '%'.$input.'%'));
+ }, '推荐人')->width(3);
$filter->between('created_at')->dateTime()->width(7);
});
});
diff --git a/app/Models/UserInfo.php b/app/Models/UserInfo.php
index 06f4be91..faea7349 100644
--- a/app/Models/UserInfo.php
+++ b/app/Models/UserInfo.php
@@ -96,6 +96,11 @@ class UserInfo extends Model
return $this->belongsTo(UserInfo::class, 'inviter_id');
}
+ public function inviter()
+ {
+ return $this->belongsTo(User::class, 'inviter_id');
+ }
+
/**
* 获取此用户的真实邀请人信息
*/