Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -3124,22 +3124,28 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account){
+    public function update_spread($uid,$spread_account,$adminId,$mark,$spreadId){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
         $identity=Db::name("user")->where('uid',$uid)->field("identity,spread_uid")->find();
-        $user_identity_log=Db::name("user_identity_log")->where(["link_id"=>$uid])->find();
+//        $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){
-                    Db::name("user_identity_log")->where(["id"=>$user_identity_log["id"]])->update(['uid'=>$spread['uid']]);
-                }else{
-                    Db::name("user_identity_log")->insert(['uid'=>$spread['uid'],"identity"=>$identity["identity"],"create_time"=>date("Y-m-d H:i:s"),"link_id"=>$uid]);
-                }
+ //               if ($user_identity_log){
+ //                   Db::name("user_identity_log")->where(["id"=>$user_identity_log["id"]])->update(['uid'=>$spread['uid']]);
+ //               }else{
+ //                   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,
+                    'uid' => $uid,
+                    '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();
                 if ($identity["spread_uid"]){
                     Db::name("user")->where('uid',$identity["spread_uid"])->dec("spread_count")->update();
@@ -3154,10 +3160,16 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $level_account){
+    public function update_level_uid($uid, $adminId, $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,
+                    'uid' => $uid,
+                    'old_level_id' => $levelId,
+                    'new_level_id' => $level,
+                    'mark' => $mark ]);
                 return Db::name("user")->where(["uid"=>$uid])->update(['level_id'=>$level['uid']]);
             }catch (\Exception $e) {
                 return false;
@@ -3165,14 +3177,13 @@ class UserRepository extends BaseRepository
         }else{
             return false;
         }
-
     }
 
-    public function update_user_group($id, $old_identity_id, $new_identity_id, $adminid, $mark)
+    public function update_user_group($id, $old_identity_id, $new_identity_id, $adminId, $mark)
     {
         try {
             Db::name("user_identity_change_records")->insert([
-                'operation_id' => $adminid,
+                'operation_id' => $adminId,
                 'uid' => $id,
                 'old_identity_id' => $old_identity_id,
                 'new_identity_id' => $new_identity_id,

app/controller/admin/user/User.php

@@ -814,7 +814,10 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
-        if($repository->update_spread($id,$spread_account)){
+        $adminId = $this->request->adminId();
+        $spreadId = $this->request->param('spreadId');
+        $mark = '后台管理员修改用户推荐人';
+        if($repository->update_spread($id,$spread_account,$adminId,$mark,$spreadId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -844,17 +847,18 @@ class User extends BaseController
      * cabbage
      * 2020-11-04
      * */
-    public function changeProLevel($id,UserRepository $repository)
-    {
+    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,$level_account)){
+        if($repository->update_level_uid($id,$adminId,$levelId,$level_account,$mark)){
             return app('json')->success("修改成功");
         }else{
-            return app('json')->fail("失败");
-        }
+            return app('json')->fail("失败"); }
     }
 
     /**
@@ -869,14 +873,14 @@ class User extends BaseController
     }
     public function changeProGroup($id,UserRepository $repository)
     {
-        $adminid = $this->request->adminId();
+        $adminId = $this->request->adminId();
         $old_identity_id = $this->request->param('old_identity_id');
         $new_identity_id = $this->request->param('new_identity_id');
         $mark = $this->request->param('mark');
         if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
-        if ($repository->update_user_group($id, $old_identity_id, $new_identity_id, $adminid, $mark)) {
+        if ($repository->update_user_group($id, $old_identity_id, $new_identity_id, $adminId, $mark)) {
             return app('json')->success("修改成功");
         } else {
             return app('json')->fail("失败");
@@ -2008,7 +2012,7 @@ class User extends BaseController
         return app('json')->success('查询成功', $userData);
     }
     /**
-     * 获取用户操作记录
+     * 用户操作记录
      */
     public function getOperatingRecordList(){
         $records = Db::name('user_operating_record')
@@ -2026,6 +2030,48 @@ class User extends BaseController
             ->toArray();
         return app('json')->success($records, '获取成功');
     }
+    //用户身份修改记录
+    public function getUserIdentityChangeRecord(){
+        $uid = request()->param('uid');
+        $records = Db::name('user_identity_change_records')
+            ->field('operation_id, uid, old_identity_id, new_identity_id, mark, create_time');
+            if($uid){
+                $records->where('uid', $uid);
+            }
+            $query=$records
+            ->order('r.create_time DESC')
+            ->paginate(20)
+            ->toArray();
+        return app('json')->success($query, '获取成功');
+    }
+    //用户推荐人修改记录
+    public function getUserSpreadChangeRecord(){
+        $uid = request()->param('uid');
+        $records = Db::name('user_identity_change_records')
+            ->field('operation_id, uid, old_identity_id, new_identity_id, mark, create_time');
+        if($uid){
+            $records->where('uid', $uid);
+        }
+        $query=$records
+            ->order('r.create_time DESC')
+            ->paginate(20)
+            ->toArray();
+        return app('json')->success($query, '获取成功');
+    }
+    //用户节点人修改记录
+    public function getUserLevelChangeRecord(){
+        $uid = request()->param('uid');
+        $records = Db::name('user_level_change_records')
+            ->field('operation_id, uid, old_level_id, new_level_id, mark, create_time');
+        if($uid){
+            $records->where('uid', $uid);
+        }
+        $query=$records
+            ->order('r.create_time DESC')
+            ->paginate(20)
+            ->toArray();
+        return app('json')->success($query, '获取成功');
+    }
     /**
      * 查询用户上下级
      */

route/admin.php

@@ -408,6 +408,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('enterpriseUserScoreApi', '/enterpriseUserScoreApi')->name('enterpriseUserScoreApi');
             //获取用户操作记录
             Route::get('getOperatingRecordList', '/getOperatingRecordList')->name('getOperatingRecordList');
+            Route::get('getUserIdentityChangeRecord', '/getUserIdentityChangeRecord')->name('getUserIdentityChangeRecord');//身份修改
+            Route::get('getUserSpreadChangeRecord','getUserSpreadChangeRecord')->name('getUserSpreadChangeRecord');//推荐人修改
+            Route::get('getUserLevelChangeRecord','getUserLevelChangeRecord')->name('getUserLevelChangeRecord');//节点人修改