Browse Source

第三方账号列表和平台账号列表添加查看对于账号账务明细的功能

jekon 6 years ago
parent
commit
52f6b87a7e

+ 62 - 17
app/Http/Controllers/Admin/BalanceController.php

@@ -17,25 +17,47 @@ class BalanceController extends Controller
      *
      * @return \Illuminate\Http\Response
      */
-    public function party()
-{
-    return view('admin.balance.index');
-}
+    public function party(Request $request)
+    {
+        $partyId = $request->get('party_id', '0');
+        return view('admin.balance.index')->with('party_id', $partyId);
+    }
 
     public function partyData(Request $request)
     {
-        $balanceModel = new Balance();
-        $res = $balanceModel
+        $partyId = $request->get('partyId');
+        $party_name = $request->get('party_name');
+        $app_name = $request->get('app_name');
+        $party_username = $request->get('party_username');
+        $type = $request->get('type', 0);
+
+        $model = new Balance();
+        $model = $model
             ->select(['ag_balance_log.*','ag_app.appname','ag_party.name'])
             ->leftJoin('ag_app', 'ag_balance_log.app_id', '=', 'ag_app.id')
-            ->leftJoin('ag_party', 'ag_balance_log.party_id', '=', 'ag_party.id')
-            ->orderBy('ag_balance_log.id','desc')
+            ->leftJoin('ag_party', 'ag_balance_log.party_id', '=', 'ag_party.id');
+        if(!empty($partyId)){
+            $model->where('party_id', $partyId);
+        }
+        if(!empty($party_name)){
+            $model->where('ag_party.name', 'like', '%'.$party_name.'%');
+        }
+        if(!empty($app_name)){
+            $model->where('ag_app.appname', 'like', '%'.$app_name.'%');
+        }
+        if(!empty($party_username)){
+            $model->where('party_username', 'like', '%'.$party_username.'%');
+        }
+        if(!empty($type)){
+            $model->where('type', $type);
+        }
+
+        $res = $model->orderBy('ag_balance_log.id','desc')
             ->paginate($request->get('limit', 30))
             ->toArray();
         ;
-
         foreach ($res['data'] as $key=>$val){
-            $res['data'][$key]['typename'] = $val['type'] == 1 ? '充值' : '扣除';
+            $res['data'][$key]['typename'] = $val['type'] == 1 ? '增加' : '减少';
         }
         $data = [
             'code' => 0,
@@ -46,25 +68,48 @@ class BalanceController extends Controller
         return response()->json($data);
     }
 
-    public function app()
+    public function app(Request $request)
     {
-        return view('admin.balance.appIndex');
+        $app_id = $request->get('app_id', '0');
+        return view('admin.balance.appIndex')->with('app_id', $app_id);
     }
 
     public function appData(Request $request)
     {
-        $balanceModel = new AppBalance();
-        $res = $balanceModel
+        $app_id = $request->get('app_id');
+        $party_name = $request->get('party_name');
+        $app_name = $request->get('app_name');
+        $app_username = $request->get('app_username');
+        $type = $request->get('type', 0);
+
+        $model = new AppBalance();
+        $model = $model
             ->select(['ag_app_balance_log.*','ag_app.appname','ag_party.name'])
             ->leftJoin('ag_app', 'ag_app_balance_log.app_id', '=', 'ag_app.id')
-            ->leftJoin('ag_party', 'ag_app_balance_log.party_id', '=', 'ag_party.id')
-            ->orderBy('ag_app_balance_log.id','desc')
+            ->leftJoin('ag_party', 'ag_app_balance_log.party_id', '=', 'ag_party.id');
+        if(!empty($app_id)){
+            $model->where('app_id', $app_id);
+        }
+        if(!empty($party_name)){
+            $model->where('ag_party.name', 'like', '%'.$party_name.'%');
+        }
+        if(!empty($app_name)){
+            $model->where('ag_app.appname', 'like', '%'.$app_name.'%');
+        }
+        if(!empty($app_username)){
+            $model->where('app_username', 'like', '%'.$app_username.'%');
+        }
+        if(!empty($type)){
+            $model->where('type', $type);
+        }
+
+        $res = $model->orderBy('ag_app_balance_log.id','desc')
             ->paginate($request->get('limit', 30))
             ->toArray();
         ;
 
         foreach ($res['data'] as $key=>$val){
-            $res['data'][$key]['typename'] = $val['type'] == 2 ? '充值' : '扣除';
+            $res['data'][$key]['typename'] = $val['type'] == 1 ? '增加' : '减少';
         }
         $data = [
             'code' => 0,

+ 3 - 0
resources/views/admin/app/index.blade.php

@@ -14,6 +14,7 @@
             <table id="dataTable" lay-filter="dataTable"></table>
             <script type="text/html" id="options">
                 <div class="layui-btn-group">
+                    <a class="layui-btn layui-btn-sm" lay-event="balanceRecord">账务记录</a>
                     <a class="layui-btn layui-btn-sm" lay-event="edit">编辑</a>
                     <a class="layui-btn layui-btn-danger layui-btn-sm " lay-event="del">删除</a>
                 </div>
@@ -64,6 +65,8 @@
                             layer.msg(result.msg,{icon:6})
                         });
                     });
+                } else if(layEvent === 'balanceRecord'){
+                    location.href = '/admin/balance/app?app_id=' + data.id;
                 } else if(layEvent === 'edit'){
                     location.href = '/admin/app/'+data.id+'/edit';
                 } else if (layEvent === 'role'){

+ 66 - 6
resources/views/admin/balance/appIndex.blade.php

@@ -4,10 +4,30 @@
     <div class="layui-card">
 
         <div class="layui-card-header layuiadmin-card-header-auto">
-            {{--<div class="layui-btn-group">
-                --}}{{--<button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删 除</button>--}}{{--
-                <a class="layui-btn layui-btn-sm" href="{{ route('admin.app.create') }}">添 加</a>
-            </div>--}}
+            <div class="layui-btn-group">
+                {{--<button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删 除</button>
+                <a class="layui-btn layui-btn-sm" href="{{ route('admin.app.create') }}">添 加</a>--}}
+
+                <button class="layui-btn layui-btn-sm" id="search">搜索{{$app_id}}</button>
+                <button class="layui-btn layui-btn-sm" id="add">增加</button>
+                <button class="layui-btn layui-btn-sm" id="reduce">减少</button>
+                @if (!empty($app_id))
+                    <button class="layui-btn layui-btn-sm" id="return">返回</button>
+                @endif
+            </div>
+            <div class="layui-form">
+                @if (empty($app_id))
+                    <div class="layui-input-inline">
+                        <input type="text" name="party_name" id="party_name" placeholder="请输入第三方名" class="layui-input">
+                    </div>
+                @endif
+                <div class="layui-input-inline">
+                    <input type="text" name="app_name" id="app_name" placeholder="请输入平台名" class="layui-input">
+                </div>
+                <div class="layui-input-inline">
+                    <input type="text" name="app_username" id="app_username" placeholder="请输入平台账号名" class="layui-input">
+                </div>
+            </div>
         </div>
 
         <div class="layui-card-body">
@@ -29,13 +49,13 @@
             var layer = layui.layer;
             var form = layui.form;
             var table = layui.table;
-
+            var app_id = {{$app_id}};
             //表格初始化
             var dataTable = table.render({
                 elem: '#dataTable'
                 ,height: 500
                 ,url: "{{ route('admin.balance.appData') }}" //数据接口
-                ,where:{model:"balance"}
+                ,where:{model:"balance", app_id:app_id}
                 ,page: true //开启分页
                 ,cols: [[ //表头
                     {checkbox: true,fixed: true}
@@ -49,6 +69,46 @@
                     ,{field: 'created_at', title: '时间'}
                 ]]
             });
+
+            //搜索
+            $("#search").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var app_username = $("#app_username").val();
+                var app_id = {{$app_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,app_username:app_username,app_id:app_id},
+                    page:{curr:1}
+                })
+            })
+
+            //搜索
+            $("#reduce").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var app_username = $("#app_username").val();
+                var app_id = {{$app_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,app_username:app_username,app_id:app_id,type:2},
+                    page:{curr:1}
+                })
+            })
+            //搜索
+            $("#add").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var app_username = $("#app_username").val();
+                var app_id = {{$app_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,app_username:app_username,app_id:app_id,type:1},
+                    page:{curr:1}
+                })
+            })
+
+            //返回
+            $("#return").click(function () {
+                location.href = "{{ route('admin.app') }}";
+            })
         })
     </script>
 @endsection

+ 65 - 6
resources/views/admin/balance/index.blade.php

@@ -4,10 +4,29 @@
     <div class="layui-card">
 
         <div class="layui-card-header layuiadmin-card-header-auto">
-            {{--<div class="layui-btn-group">
-                --}}{{--<button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删 除</button>--}}{{--
-                <a class="layui-btn layui-btn-sm" href="{{ route('admin.party.create') }}">添 加</a>
-            </div>--}}
+            <div class="layui-btn-group">
+                {{--<button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删 除</button>
+                <a class="layui-btn layui-btn-sm" href="{{ route('admin.party.create') }}">添 加</a>--}}
+                <button class="layui-btn layui-btn-sm" id="search">搜索</button>
+                <button class="layui-btn layui-btn-sm" id="add">增加</button>
+                <button class="layui-btn layui-btn-sm" id="reduce">减少</button>
+                @if (!empty($party_id))
+                    <button class="layui-btn layui-btn-sm" id="return">返回</button>
+                @endif
+            </div>
+            <div class="layui-form">
+                @if (empty($party_id))
+                <div class="layui-input-inline">
+                    <input type="text" name="party_name" id="party_name" placeholder="请输入第三方名" class="layui-input">
+                </div>
+                @endif
+                <div class="layui-input-inline">
+                    <input type="text" name="app_name" id="app_name" placeholder="请输入平台名" class="layui-input">
+                </div>
+                <div class="layui-input-inline">
+                    <input type="text" name="party_username" id="party_username" placeholder="请输入账号名" class="layui-input">
+                </div>
+            </div>
         </div>
 
         <div class="layui-card-body">
@@ -29,13 +48,13 @@
             var layer = layui.layer;
             var form = layui.form;
             var table = layui.table;
-
+            var partyId = {{$party_id}};
             //表格初始化
             var dataTable = table.render({
                 elem: '#dataTable'
                 ,height: 500
                 ,url: "{{ route('admin.balance.partyData') }}" //数据接口
-                ,where:{model:"balance"}
+                ,where:{model:"balance", partyId:partyId}
                 ,page: true //开启分页
                 ,cols: [[ //表头
                     {checkbox: true,fixed: true}
@@ -49,6 +68,46 @@
                     ,{field: 'created_at', title: '时间'}
                 ]]
             });
+
+            //搜索
+            $("#search").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var party_username = $("#party_username").val();
+                var partyId = {{$party_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,party_username:party_username,partyId:partyId},
+                    page:{curr:1}
+                })
+            })
+
+            //搜索
+            $("#reduce").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var party_username = $("#party_username").val();
+                var partyId = {{$party_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,party_username:party_username,partyId:partyId,type:2},
+                    page:{curr:1}
+                })
+            })
+            //搜索
+            $("#add").click(function () {
+                var party_name = $("#party_name").val();
+                var app_name = $("#app_name").val();
+                var party_username = $("#party_username").val();
+                var partyId = {{$party_id}};
+                dataTable.reload({
+                    where:{party_name:party_name,app_name:app_name,party_username:party_username,partyId:partyId,type:1},
+                    page:{curr:1}
+                })
+            })
+
+            //返回
+            $("#return").click(function () {
+                location.href = "{{ route('admin.party') }}";
+            })
         })
     </script>
 @endsection

+ 9 - 3
resources/views/admin/party/index.blade.php

@@ -14,6 +14,7 @@
             <table id="dataTable" lay-filter="dataTable"></table>
             <script type="text/html" id="options">
                 <div class="layui-btn-group">
+                    <a class="layui-btn layui-btn-sm" lay-event="balanceRecord">账务记录</a>
                     <a class="layui-btn layui-btn-sm" lay-event="edit">编辑</a>
                     <a class="layui-btn layui-btn-danger layui-btn-sm " lay-event="del">删除</a>
                 </div>
@@ -29,18 +30,21 @@
             var layer = layui.layer;
             var form = layui.form;
             var table = layui.table;
+            var url = document.location.toString();
+            var arrUrl = url.split("=");
+            var para = arrUrl[1];
 
             //第三方表格初始化
             var dataTable = table.render({
                 elem: '#dataTable'
                 ,height: 500
                 ,url: "{{ route('admin.party.data') }}" //数据接口
-                ,where:{model:"party"}
+                ,where:{model:"party", party_id:para}
                 ,page: true //开启分页
                 ,cols: [[ //表头
                     {checkbox: true,fixed: true}
                     ,{field: 'id', title: 'ID', sort: true,width:80}
-                    ,{field: 'name', title: '第三方名', event:'aa'}
+                    ,{field: 'name', title: '第三方名'}
                     ,{field: 'balance', title: '剩余额度'}
                     ,{field: 'phone', title: '联系电话'}
                     ,{field: 'add_user', title: '添加者'}
@@ -64,9 +68,11 @@
                             layer.msg(result.msg,{icon:6})
                         });
                     });
+                } else if(layEvent === 'balanceRecord'){
+                    location.href = '/admin/balance/app?app_id=' + data.id;
                 } else if(layEvent === 'edit'){
                     location.href = '/admin/party/'+data.id+'/edit';
-                } else if (layEvent === 'role'){
+                }  else if (layEvent === 'role'){
                     location.href = '/admin/party/'+data.id+'/role';
                 } else if (layEvent === 'permission'){
                     location.href = '/admin/party/'+data.id+'/permission';