diff --git a/app/controller/admin/user/UserBill.php b/app/controller/admin/user/UserBill.php index 1e63e5a5..040c4f77 100644 --- a/app/controller/admin/user/UserBill.php +++ b/app/controller/admin/user/UserBill.php @@ -19,6 +19,7 @@ use crmeb\basic\BaseController; use app\common\repositories\user\UserBillRepository; use crmeb\services\ExcelService; use think\App; +use think\facade\Db; class UserBill extends BaseController { @@ -50,4 +51,28 @@ class UserBill extends BaseController $data = app()->make(ExcelService::class)->bill($where,$page,$limit); return app('json')->success($data); } + + public function deposit(){ + $where = $this->request->params(['keyword', 'date']); + // ->when(isset($where['date']) && $where['date'] !== '', function ($query) use ($where) { + // getModelTime($query, $where['date'], 'create_time'); + // }) + // ->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) { + // $query->whereLike('a.uid|b.nickname|a.title', "%{$where['keyword']}%"); + // }) + // whereTime('birthday', 'between', ['1970-10-1', '2000-10-1']) + + [$page, $limit] = $this->getPage(); + $query= Db::name('margin_order')->where('paid',1); + // if(isset($where['date'])) + + $list=$query->withAttr('mer_name',function($value,$data){ + return Db::name('merchant')->where('mer_id',$data['mer_id'])->value('mer_name'); + }) + ->withAttr('nickname',function($value,$data){ + return Db::name('user')->where('uid',$data['uid'])->value('nickname'); + }) + ->page($page, $limit)->order('order_id', 'desc')->select()->toArray(); + return app('json')->success($list); + } } diff --git a/route/admin/accounts.php b/route/admin/accounts.php index f5c4c0ec..6da6e1bb 100644 --- a/route/admin/accounts.php +++ b/route/admin/accounts.php @@ -148,6 +148,9 @@ Route::group(function () { //余额变动记录 Route::group('bill', function () { + Route::get('deposit', 'UserBill/deposit')->name('systemUserBillDeposit')->option([ + '_alias' => '押金列表', + ]); Route::get('list', 'UserBill/getList')->name('systemUserBillList')->option([ '_alias' => '列表', ]);