Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -852,7 +852,8 @@ class UserRepository extends BaseRepository
         }
         return Elm::createForm(Route::buildUrl('systemUserChangePro', compact('id'))->build(), [
             Elm::input('spread_account_old', '原推荐人')->value($spread_message['account'].'('.$spread_message['nickname'].')')->disabled(true),
-            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号")
+            Elm::input('spread_account', '推荐人')->required()->placeholder("请填写推荐人手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户推荐人');
     }
 
@@ -873,7 +874,8 @@ class UserRepository extends BaseRepository
         }
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
             Elm::input('level_account_old', '原节点人')->value($level_message['account'].'('.$level_message['nickname'].')')->disabled(true),
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号"),
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户节点人（上级）');
     }
 
@@ -891,7 +893,7 @@ class UserRepository extends BaseRepository
         return Elm::createForm(Route::buildUrl('systemUserChangeGroupPro', compact('id'))->build(), [
             Elm::select('old_identity_id', '当前用户身份')->options([$oldIdentity])->value($oldIdentity['value'])->disabled(true),
             Elm::select('new_identity_id', '新的用户身份')->options($identityList),
-            Elm::textarea('mark', '备注', '')->required()->placeholder('请填写备注信息')
+            Elm::textarea('mark', '备注', '')->placeholder('填写备注信息')
         ])->setTitle('修改用户身份');
     }
 
@@ -3124,7 +3126,7 @@ class UserRepository extends BaseRepository
    *@author cabbage
    *@date 2020-10-31
    * */
-    public function update_spread($uid,$spread_account,$mark,$olld_id){
+    public function update_spread($uid,$spread_account,$mark,$olld_id,$adminId){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
@@ -3140,7 +3142,7 @@ 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("user_spread_change_records")->insert([
-                    'operation_id' => 1,
+                    'operation_id' => $adminId,
                     'uid' => $uid,
                     'old_spread_id' => $olld_id,
                     'new_spread_id' => $spread['uid'],
@@ -3160,13 +3162,13 @@ class UserRepository extends BaseRepository
 
     }
 
-    public function update_level_uid($uid, $account, $level_account, $mark){
+    public function update_level_uid($uid, $account, $level_account, $mark,$adminId){
         $level = Db::name("user")->where('account',$level_account)->field("uid,account")->find();
         $levelId = Db::name("user")->where('account',$account)->value("uid");
         if($level){
             try{
                 Db::name("user_level_change_records")->insert([
-                    'operation_id' => 1,
+                    'operation_id' => $adminId,
                     'uid' => $uid,
                     'old_level_id' => $levelId,
                     'new_level_id' => $level['uid'],

app/controller/admin/user/User.php

@@ -814,9 +814,10 @@ class User extends BaseController
     public  function  changePro($id,UserRepository $repository)
     {
         $spread_account = $this->request->param('spread_account');
+        $adminId = $this->request->adminId();
+        $mark = $this->getMark($adminId,'spread');
         $olld_id = Db::name('user')->where('uid', $id)->value('spread_uid')??0;
-        $mark = '后台管理员修改用户推荐人';
-        if($repository->update_spread($id,$spread_account,$mark,$olld_id)){
+        if($repository->update_spread($id,$spread_account,$mark,$olld_id,$adminId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");
@@ -850,11 +851,12 @@ class User extends BaseController
         $level_account = $this->request->param('level_account');
         $level_account_old = $this->request->param('level_account_old');
         $account = explode('(', $level_account_old)[0];
-        $mark = '后台管理员修改用户节点人';
+        $adminId = $this->request->adminId();
+        $mark = $this->getMark($adminId,'level');
         if (!$id) {
             return app('json')->fail("参数丢失");
         }
-        if($repository->update_level_uid($id,$account,$level_account,$mark)){
+        if($repository->update_level_uid($id,$account,$level_account,$mark,$adminId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败"); }
@@ -875,7 +877,8 @@ class User extends BaseController
         $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');
+        $adminId = $this->request->adminId();
+        $mark = $this->getMark($adminId,'identity');
         if (empty($id) || empty($old_identity_id) || empty($new_identity_id)) {
             return app('json')->fail("参数丢失");
         }
@@ -2034,10 +2037,10 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_identity_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_identity_id, r.new_identity_id, r.mark, r.create_time');
+            ->join('user u', 'r.uid = u.uid', 'LEFT')
+            ->field('r.operation_id,r.old_identity_id,r.new_identity_id,r.mark,r.create_time,u.nickname,u.account');
             if($uid){
-                $records->where('r.uid', $uid);
+                $records->where('uid', $uid);
             }
             $query=$records
             ->order('create_time DESC')
@@ -2050,8 +2053,9 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_spread_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_spread_id, r.new_spread_id, r.mark, r.create_time');
+            ->join('user u', 'u.uid = r.old_spread_id', 'LEFT')
+            ->join('user ua', 'ua.uid = r.new_spread_id', 'LEFT')
+            ->field('r.operation_id,r.uid,u,account as old_account,ua.account as new_account,r.mark, r.create_time');
 
         if ($uid) {
             $records->where('r.uid', $uid);
@@ -2070,8 +2074,9 @@ class User extends BaseController
         $uid = $id;
         $records = Db::name('user_level_change_records')
             ->alias('r')
-            ->join('user u', 'u.uid = r.uid', 'LEFT')
-            ->field('r.operation_id, r.uid, u.nickname, u.account, r.old_level_id, r.new_level_id, r.mark, r.create_time');
+            ->join('user u', 'u.uid = r.old_level_id', 'LEFT')
+            ->join('user ua', 'ua.uid = r.new_level_id', 'LEFT')
+            ->field('r.operation_id, r.uid, u.account as old_account, ua.account as new_account, r.mark, r.create_time');
         if($uid){
             $records->where('r.uid', $uid);
         }
@@ -2095,4 +2100,47 @@ class User extends BaseController
             ->toArray();
         return app('json')->success($query, '获取成功');
     }
+    /**
+     * 通过后台管理员id和修改信息来区别默认备注
+     */
+    protected function getMark($adminId, string $type)
+    {
+        $mark = $this->request->param('mark');
+        if ($mark) {
+            return $mark;
+        }
+        $defaultMap = [
+            'spread'   => '后台管理员修改用户推荐人',
+            'level'     => '后台管理员修改用户节点人',
+            'identity' => '后台管理员修改用户身份',
+        ];
+        $markMap = [
+            'spread' => [
+                1 => 'admin修改用户推荐人',
+                10 => '商户+文章管理员修改用户推荐人',
+                25 => '运营管理员修改用户推荐人',
+                27 => '订单发货管理员修改用户推荐人',
+                28 => '财务管理员修改用户推荐人',
+                29 => '超级管理员修改用户推荐人',
+            ],
+            'node' => [
+                1 => 'admin修改用户节点人',
+                10 => '商户+文章管理员修改用户节点人',
+                25 => '运营管理员修改用户节点人',
+                27 => '订单发货管理员修改用户节点人',
+                28 => '财务管理员修改用户节点人',
+                29 => '超级管理员修改用户节点人',
+            ],
+            'identity' => [
+                1 => 'admin修改用户身份',
+                10 => '商户+文章管理员修改用户身份',
+                25 => '运营管理员修改用户身份',
+                27 => '订单发货管理员修改用户身份',
+                28 => '财务管理员修改用户身份',
+                29 => '超级管理员修改用户身份',
+            ]
+        ];
+        return $markMap[$type][$adminId] ?? ($defaultMap[$type] ?? '哈基米修改用户信息');
+    }
+
 }