Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -3124,7 +3124,7 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$adminId,$mark,$spreadId){
+    public function update_spread($uid,$spread_account,$mark){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
@@ -3132,7 +3132,6 @@ class UserRepository extends BaseRepository
 //        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
         if($spread){
             try{
-
                 $data= Db::name("user")->where(["uid"=>$uid])->update(['spread_uid'=>$spread['uid']]);
                 Db::name("merchant")->where(["uid"=>$uid])->update(['recommender'=>$spread['uid']]);
  //               if ($user_identity_log){
@@ -3141,9 +3140,9 @@ class UserRepository extends BaseRepository
  //                   Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
  //               }
                 Db::name("rrx_user_spread_change_records")->insert([
-                    'operation_id' => $adminId,
+                    'operation_id' => '1',
                     'uid' => $uid,
-                    'old_spread_id' => $spreadId,
+                    'old_spread_id' => $identity['spread_uid'],
                     'new_spread_id' => $spread['uid'],
                     'mark' => $mark ]);
                 Db::name("user")->where('account',$spread_account)->inc("spread_count",1)->update();
@@ -3160,15 +3159,15 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $adminId, $levelId, $level_account, $mark){
+    public function update_level_uid($uid, $levelId, $level_account, $mark){
         $level = Db::name("user")->where('account',$level_account)->field("uid")->find();
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([
-                    'operation_id' => $adminId,
+                    'operation_id' => '1',
                     'uid' => $uid,
                     'old_level_id' => $levelId,
-                    'new_level_id' => $level,
+                    'new_level_id' => $level['uid'],
                     'mark' => $mark ]);
                 return Db::name("user")->where(["uid"=>$uid])->update(['level_id'=>$level['uid']]);
             }catch (\Exception $e) {

app/controller/admin/user/User.php

@@ -814,10 +814,8 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        $adminId = $this->request->adminId();
-        $spreadId = $this->request->param('spreadId');
         $mark = '后台管理员修改用户推荐人';
-        if($repository->update_spread($id,$spread_account,$adminId,$mark,$spreadId)){
+        if($repository->update_spread($id,$spread_account,$mark)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -849,13 +847,12 @@ class User extends BaseController
      * */
     public function changeProLevel($id,UserRepository $repository) {
         $level_account = $this->request->param('level_account');
-        $adminId = $this->request->adminId();
         $levelId = $this->request->levelId();
         $mark = '后台管理员修改用户节点人';
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$adminId,$levelId,$level_account,$mark)){
+        if($repository->update_level_uid($id,$levelId,$level_account,$mark)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }
@@ -2031,7 +2028,8 @@ class User extends BaseController
         return app('json')->success($records, '获取成功');
     }
     //用户身份修改记录
-    public function getUserIdentityChangeRecord($uid){
+    public function getUserIdentityChangeRecord($id){
+        $uid = $id;
         $records = Db::name('user_identity_change_records')
             ->field('operation_id, uid, old_identity_id, new_identity_id, mark, create_time');
             if($uid){
@@ -2044,9 +2042,10 @@ class User extends BaseController
         return app('json')->success($query, '获取成功');
     }
     //用户推荐人修改记录
-    public function getUserSpreadChangeRecord($uid){
-        $records = Db::name('user_identity_change_records')
-            ->field('operation_id, uid, old_identity_id, new_identity_id, mark, create_time');
+    public function getUserSpreadChangeRecord($id){
+        $uid = $id;
+        $records = Db::name('user_spread_change_records')
+            ->field('operation_id, uid, old_spread_id, new_spread_id, mark, create_time');
         if($uid){
             $records->where('uid', $uid);
         }
@@ -2057,7 +2056,8 @@ class User extends BaseController
         return app('json')->success($query, '获取成功');
     }
     //用户节点人修改记录
-    public function getUserLevelChangeRecord($uid){
+    public function getUserLevelChangeRecord($id){
+        $uid = $id;
         $records = Db::name('user_level_change_records')
             ->field('operation_id, uid, old_level_id, new_level_id, mark, create_time');
         if($uid){
@@ -2072,8 +2072,11 @@ class User extends BaseController
     /**
      * 查询用户上下级
      */
-    public function getusersxj(){
-
+    public function getUserLevelList($id){
+        $uid = $id;
+        $records = Db::name('users')->where('uid',$uid)->field('level_id')->find();
+        $query = Db::name('users')->where('level_id',$uid)->field('uid')->select()->toArray();
+        return app('json')->success(['user_level' => $records, 'user_children' => $query], '获取成功');
     }
 
 }

route/admin.php

@@ -406,11 +406,13 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('getImAdmin', '/getImAdmin')->name('getImAdmin');
 
             Route::get('enterpriseUserScoreApi', '/enterpriseUserScoreApi')->name('enterpriseUserScoreApi');
-            //获取用户操作记录
-            Route::get('getUserIdentityChangeRecord/:uid', '/getUserIdentityChangeRecord')->name('getUserIdentityChangeRecord');//身份修改
-            Route::get('getUserSpreadChangeRecord/:uid','/getUserSpreadChangeRecord')->name('getUserSpreadChangeRecord');//推荐人修改
-            Route::get('getUserLevelChangeRecord/:uid','/getUserLevelChangeRecord')->name('getUserLevelChangeRecord');//节点人修改
-            Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');
+            //获取用户操作记录列表
+            Route::get('getUserIdentityChangeRecord/:id', '/getUserIdentityChangeRecord')->name('getUserIdentityChangeRecord');//身份修改
+            Route::get('getUserSpreadChangeRecord/:id','/getUserSpreadChangeRecord')->name('getUserSpreadChangeRecord');//推荐人修改
+            Route::get('getUserLevelChangeRecord/:id','/getUserLevelChangeRecord')->name('getUserLevelChangeRecord');//节点人修改
+            Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');//同意用户协议
+            //获取用户上下级列表
+            Route::get('getUserLevelList/:id','/getUserLevelList')->name('getUserLevelList');