Merge pull request 'dev' (#24) from dev into preview

Reviewed-on: #24

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,35 @@ 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','mer_id']);
+        [$page, $limit] = $this->getPage();
+        $query= Db::name('margin_order')->where('paid',1);
+        if(isset($where['date'])&& $where['date']!=''){
+            $a=explode(' ',$where['date']);
+           $query->whereTime('create_time', 'between', [$a[0],$a[1]]);
+        }
+        if(isset($where['keyword'])&& $where['keyword']!=''){
+            $a=Db::name('merchant')->whereLike('mer_name','%'.$where['keyword'].'%')->column('mer_id');
+            if($a){
+                $query->where('mer_id', 'in', $a);
+            }
+        }
+
+        if(isset($where['mer_id'])&& $where['mer_id']!=''){
+           $query->where('mer_id', $where['mer_id']);
+        }
+
+        $count=$query->count();
+
+        $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(['count'=>$count,'list'=>$list]);
+    }
 }

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' => '列表',
         ]);