后台管理：新增修改平台和第三方时不能设置余额，新增时记录添加者

app/Http/Controllers/Admin/AppController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Requests\AppCreateRequest;
 use App\Http\Requests\AppUpdateRequest;
 use App\Models\App;
+use App\Models\Balance;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Role;
@@ -23,7 +24,14 @@ class AppController extends Controller
 
     public function data(Request $request)
     {
-        $res = App::paginate($request->get('limit', 30))->toArray();
+        $appModel = new App();
+        $res = $appModel
+            ->select(['ag_app.*','users.username as add_user'])
+            ->leftJoin('users', 'ag_app.add_user', '=', 'users.id')
+            ->paginate($request->get('limit', 30))
+            ->toArray();
+        ;
+
         $data = [
             'code' => 0,
             'msg'   => '正在请求中...',
@@ -52,6 +60,10 @@ class AppController extends Controller
     public function store(AppCreateRequest $request)
     {
         $data = $request->all();
+
+        $add_user_id = $request->session()->get('userInfo')['id'];
+        $data['add_user'] = $add_user_id;
+
         if (App::create($data)){
             return redirect()->to(route('admin.app'))->with(['status'=>'添加成功']);
         }

app/Http/Controllers/Admin/PartyController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\PartyCreateRequest;
 use App\Http\Requests\PartyUpdateRequest;
+use App\Models\App;
 use App\Models\Party;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -23,7 +24,15 @@ class PartyController extends Controller
 
     public function data(Request $request)
     {
-        $res = Party::paginate($request->get('limit', 30))->toArray();
+        $partyModel = new Party();
+        $res = $partyModel
+            ->select(['ag_party.*','users.username as add_user'])
+            ->leftJoin('users', 'ag_party.add_user', '=', 'users.id')
+            ->paginate($request->get('limit', 30))
+            ->toArray();
+        ;
+
+        //$res = Party::paginate($request->get('limit', 30))->toArray();
         $data = [
             'code' => 0,
             'msg'   => '正在请求中...',
@@ -52,6 +61,10 @@ class PartyController extends Controller
     public function store(PartyCreateRequest $request)
     {
         $data = $request->all();
+
+        $add_user_id = $request->session()->get('userInfo')['id'];
+        $data['add_user'] = $add_user_id;
+
         if (Party::create($data)){
             return redirect()->to(route('admin.party'))->with(['status'=>'添加成功']);
         }

app/Http/Controllers/Api/PartyController.php

@@ -86,7 +86,6 @@ class PartyController extends Controller
                     'password' => $req->input('password'),
                     'login_time' => now(),
                     'login_ip' => $this->get_real_ip(),
-                    //'ctime' =>now()
                 ]);
             }else{
                 $partyUserModel->where('id', $partyUserInfo['id'])->update([
@@ -114,7 +113,6 @@ class PartyController extends Controller
                     'password' => $req->input('password'),
                     'login_time' => now(),
                     'login_ip' => $this->get_real_ip(),
-                    //'ctime' =>now()
                 ]);
             }else{
                 $appUserModel->where('id', $appUserInfo['id'])->update([
@@ -152,7 +150,6 @@ class PartyController extends Controller
                 'party_id' =>$partyInfo['id'],
                 'party_username' => $partyUserName,
                 'billno' => $billno,
-                //'ctime' =>now()
             ]);
             if($result1 === false || $result2 === false || $result3 === false){
                 DB::rollBack();

app/Http/Controllers/Sys/AppController.php

@@ -91,7 +91,6 @@ class AppController extends Controller
             'app_username' => $appUsername,
             'party_id' =>$partyId,
             'party_username' => $partyUserName,
-            //'ctime' =>now()
         ]);
         if($result === false){
             $appUserModel->rollBack();

app/Http/Requests/AppCreateRequest.php

@@ -24,7 +24,7 @@ class AppCreateRequest extends FormRequest
     public function rules()
     {
         return [
-            'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
+            //'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
             'phone' => 'required|numeric|regex:/^1[34578][0-9]{9}$/|unique:ag_app,phone,'.$this->get('id').',id',
             'appname'  => 'required|min:2|max:14|unique:ag_app,appname,'.$this->get('id').',id',
         ];

app/Http/Requests/AppUpdateRequest.php

@@ -24,7 +24,7 @@ class AppUpdateRequest extends FormRequest
     public function rules()
     {
         $reture = [
-            'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
+            //'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
             'phone' => 'required|numeric|regex:/^1[34578][0-9]{9}$/|unique:ag_app,phone,'.$this->get('id').',id',
             'appname'  => 'required|min:2|max:14|unique:ag_app,appname,'.$this->get('id').',id',
         ];

app/Http/Requests/PartyCreateRequest.php

@@ -24,13 +24,10 @@ class PartyCreateRequest extends FormRequest
     public function rules()
     {
         return [
-            'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
+            //'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
             'phone' => 'required|numeric|regex:/^1[34578][0-9]{9}$/|unique:ag_party,phone,'.$this->get('id').',id',
             'key' => 'required|unique:ag_party,key,'.$this->get('id').',id',
             'name'  => 'required|min:2|max:14|unique:ag_party,name,'.$this->get('id').',id',
-            //'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/,'.$this->get('id').',id',
-            //'phone'   => 'required|numeric|regex:/^1[3456789][0-9]{9}$/|unique:users',
-            //'username'  => 'required|min:4|max:14|unique:users',
         ];
     }
 }

app/Http/Requests/PartyUpdateRequest.php

@@ -24,7 +24,7 @@ class PartyUpdateRequest extends FormRequest
     public function rules()
     {
         $reture = [
-            'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
+            //'balance' => 'required|regex:/^[0-9]{1,8}(.[0-9]{1,2})?$/|',
             'phone' => 'required|numeric|regex:/^1[34578][0-9]{9}$/|unique:ag_party,phone,'.$this->get('id').',id',
             'key' => 'required|unique:ag_party,key,'.$this->get('id').',id',
             'name'  => 'required|min:2|max:14|unique:ag_party,name,'.$this->get('id').',id',

app/Models/App.php

@@ -9,7 +9,7 @@ class App extends Model
     protected $table = 'ag_app';
 
 
-    protected $fillable = ['appname', 'status', 'balance','domo', 'login_api', 'register_api', 'create_at', 'update_at'];
+    protected $fillable = ['appname', 'status', 'balance','domo', 'phone', 'add_user', 'login_api', 'register_api', 'create_at', 'update_at'];
 
 
 }

app/Models/Party.php

@@ -8,7 +8,7 @@ class Party extends Model
 {
     protected $table = 'ag_party';
 
-    protected $fillable = ['name','balance','domo', 'key', 'phone', 'secret', 'login_out_api', 'create_at', 'update_at'];
+    protected $fillable = ['name','balance','domo', 'key', 'phone', 'add_user', 'secret', 'login_out_api', 'create_at', 'update_at'];
 
 
 }

resources/views/admin/app/_form.blade.php

@@ -5,12 +5,12 @@
         <input type="text" name="appname" value="{{ $app->appname ?? old('appname') }}" lay-verify="required" placeholder="请输入平台名" class="layui-input" >
     </div>
 </div>
-<div class="layui-form-item">
+{{--<div class="layui-form-item">
     <label for="" class="layui-form-label">额&nbsp;&nbsp;&nbsp;度</label>
     <div class="layui-input-inline">
         <input type="text" name="balance" value="{{$app->balance ?? old('balance')}}" required="" lay-verify="required" placeholder="余额" autocomplete="off" class="layui-input" >
     </div>
-</div>
+</div>--}}
 
 <div class="layui-form-item">
     <label for="" class="layui-form-label">联系电话</label>

resources/views/admin/app/index.blade.php

@@ -43,8 +43,8 @@
                     ,{field: 'appname', title: '平台名'}
                     ,{field: 'balance', title: '剩余额度'}
                     ,{field: 'phone', title: '联系电话'}
-                    ,{field: 'add_app', title: '添加者'}
-                    ,{field: 'ctime', title: '创建时间'}
+                    ,{field: 'add_user', title: '添加者'}
+                    ,{field: 'created_at', title: '创建时间'}
                     ,{field: 'updated_at', title: '更新时间'}
                     ,{fixed: 'right', title:'操作', align:'center', toolbar: '#options'}
                 ]]

resources/views/admin/appUser/index.blade.php

@@ -4,10 +4,10 @@
     <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>--}}
+            {{--<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.appUser.create') }}">添 加</a>
-            </div>
+            </div>--}}
         </div>
 
         <div class="layui-card-body">

resources/views/admin/login_register/login.blade.php

@@ -25,21 +25,21 @@
                     </div>
                 </div>
             </div>--}}
-            <div class="layui-form-item" style="margin-bottom: 20px;">
+            {{--<div class="layui-form-item" style="margin-bottom: 20px;">
                 <input type="checkbox" name="remember" lay-skin="primary" title="记住密码">
                 <a href="forget.html" class="layadmin-user-jump-change layadmin-link" style="margin-top: 7px;">忘记密码？</a>
-            </div>
+            </div>--}}
             <div class="layui-form-item">
                 <button type="submit" class="layui-btn layui-btn-fluid" lay-submit lay-filter="">登 入</button>
             </div>
         </form>
-        <div class="layui-trans layui-form-item layadmin-user-login-other">
+       {{-- <div class="layui-trans layui-form-item layadmin-user-login-other">
             <label>社交账号登入</label>
             <a href="javascript:;"><i class="layui-icon layui-icon-login-qq"></i></a>
             <a href="javascript:;"><i class="layui-icon layui-icon-login-wechat"></i></a>
             <a href="javascript:;"><i class="layui-icon layui-icon-login-weibo"></i></a>
 
             <a href="reg.html" class="layadmin-user-jump-change layadmin-link">注册帐号</a>
-        </div>
+        </div>--}}
     </div>
 @endsection

resources/views/admin/party/_form.blade.php

@@ -5,12 +5,12 @@
         <input type="text" name="name" value="{{ $party->name ?? old('name') }}" lay-verify="required" placeholder="请输入第三方名" class="layui-input" >
     </div>
 </div>
-<div class="layui-form-item">
+{{--<div class="layui-form-item">
     <label for="" class="layui-form-label">额&nbsp;&nbsp;&nbsp;度</label>
     <div class="layui-input-inline">
         <input type="text" name="balance" value="{{$party->balance ?? old('balance')}}" required="" lay-verify="required" placeholder="余额" autocomplete="off" class="layui-input" >
     </div>
-</div>
+</div>--}}
 
 <div class="layui-form-item">
     <label for="" class="layui-form-label">联系电话</label>

resources/views/admin/party/index.blade.php

@@ -43,8 +43,8 @@
                     ,{field: 'name', title: '第三方名'}
                     ,{field: 'balance', title: '剩余额度'}
                     ,{field: 'phone', title: '联系电话'}
-                    ,{field: 'add_party', title: '添加者'}
-                    ,{field: 'ctime', title: '创建时间'}
+                    ,{field: 'add_user', title: '添加者'}
+                    ,{field: 'created_at', title: '创建时间'}
                     ,{field: 'updated_at', title: '更新时间'}
                     ,{fixed: 'right', title: '操作', align:'center', toolbar: '#options'}
                 ]]

resources/views/admin/partyUser/index.blade.php

@@ -4,10 +4,10 @@
     <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>--}}
+            {{--<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.partyUser.create') }}">添 加</a>
-            </div>
+            </div>--}}
         </div>
 
         <div class="layui-card-body">