Explorar o código

后台-修改推荐人节点人用户身份-(完成)新增展示用户原推荐人和节点人(beta)用户身份

xupuyuan hai 11 meses
pai
achega
75aa405013

+ 2 - 1
app/common/repositories/user/UserRepository.php

@@ -3110,9 +3110,10 @@ class UserRepository extends BaseRepository
3110 3110
 
3111 3111
     }
3112 3112
 
3113
-    public function update_user_group($id,$group_id)
3113
+    public function update_user_group($id,$group_id,$adminid,$mark)
3114 3114
     {
3115 3115
         try {
3116
+            Db::name("user_group_record")->insert(['adminid' => $adminid,'uid' => $id,'mark' => $mark]);
3116 3117
             return Db::name("user")->where("uid", $id)->update(['user_group' => $group_id]);
3117 3118
         } catch (\Exception $e) {
3118 3119
             return false;

+ 8 - 6
app/controller/admin/user/User.php

@@ -860,20 +860,22 @@ class User extends BaseController
860 860
     /**
861 861
      * 更改用户身份
862 862
      */
863
-    public function changeProusergroupfrom($id)
863
+    public function changeProUsergroupFrom($id)
864 864
     {
865 865
         if (!$this->repository->exists($id))
866 866
             return app('json')->fail('数据不存在');
867 867
         $formData = formToData($this->repository->changeProFormusergroup($id));
868 868
         return app('json')->success(array_merge($formData));
869 869
     }
870
-    public function changeProusergroup($id,UserRepository $repository)
870
+    public function changeProUsergroup($id,UserRepository $repository)
871 871
     {
872 872
         $group_id = $this->request->param('group_id');
873
+        $adminid = $this->request->adminId();
874
+        $mark = $this->request->param('mark');
873 875
         if (!$id) {
874 876
             return app('json')->fail("参数丢失");
875 877
         }
876
-        if ($repository->update_user_group($id, $group_id)) {
878
+        if ($repository->update_user_group($id, $group_id,$adminid,$mark)) {
877 879
             return app('json')->success("修改成功");
878 880
         } else {
879 881
             return app('json')->fail("失败");
@@ -2011,9 +2013,9 @@ class User extends BaseController
2011 2013
         $records = Db::name('user_operating_record')
2012 2014
             ->alias('r')
2013 2015
             ->join('user u', 'r.uid = u.uid', 'LEFT')
2014
-            ->field('r.*, u.phone,u.nickname')
2015
-            ->order('create_time DESC')
2016
-            ->select()
2016
+            ->field('r.*, u.phone, u.nickname')
2017
+            ->order('r.create_time DESC')
2018
+            ->paginate(20)
2017 2019
             ->toArray();
2018 2020
         return app('json')->success($records, '获取成功');
2019 2021
     }

+ 3 - 0
route/admin.php

@@ -372,6 +372,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
372 372
             //修改用户节点人(上级)
373 373
             Route::get('change_pro_level/form/:id', '/changeProLevelForm')->name('systemUserChangeProLevelForm');
374 374
             Route::post('change_pro_level/:id', '/changeProLevel')->name('systemUserChangeLevelPro');
375
+            //修改用户身份
376
+            Route::get('change_pro_usergroup/form/:id', '/changeProUsergroupFrom')->name('systemUserChangeProUsergroupFrom');
377
+            Route::post('change_pro_usergroup/:id', '/changeProUsergroup')->name('systemUserChangeUsergroupPro');
375 378
             //用户奖励变更
376 379
             Route::get('change_award/form/:id', '/changeAwardForm')->name('systemUserChangeAwardForm');
377 380
             Route::post('change_award/:id', '/changeAward')->name('systemUserChangeAward');