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,$mark){
+    public function update_spread($uid,$spread_account,$mark,$spreadId){
         //推荐人信息
         $spread = Db::name("user")->where('account',$spread_account)->field("uid")->find();
         //被推荐人信息
@@ -3139,13 +3139,11 @@ class UserRepository extends BaseRepository
  //               }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]);
  //               }
-                $old_spread_id = $identity['spread_uid'];
-                $new_spread_id = $spread['uid'];
                 Db::name("rrx_user_spread_change_records")->insert([
                     'operation_id' => 1,
                     'uid' => $uid,
-                    'old_spread_id' => $old_spread_id,
-                    'new_spread_id' => $new_spread_id,
+                    'old_spread_id' => $spreadId,
+                    'new_spread_id' => $spread['uid'],
                     'mark' => $mark
                 ]);
                 Db::name("user")->where('account',$spread_account)->inc("spread_count",1)->update();

app/controller/admin/user/User.php

@@ -815,7 +815,8 @@ class User extends BaseController
     {
         $spread_account = $this->request->param('spread_account');
         $mark = '后台管理员修改用户推荐人';
-        if($repository->update_spread($id,$spread_account,$mark)){
+        $spreadId = $this->request->param('spreadId');
+        if($repository->update_spread($id,$spread_account,$mark,$spreadId)){
             return app('json')->success("修改成功");
         }else{
             return app('json')->fail("失败");