Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/user/UserRepository.php

@@ -4475,17 +4475,6 @@ class UserRepository extends BaseRepository
         ])->setTitle('编辑');
     }
 
-    //记录用户确认了用户协议
-    public function userar($uid){
-        Db::name('operating_record')->insert([
-            'uid' => $uid,
-            'operation_model' => '1',
-            'operation_type' => '1',
-            'mark' => '用户同意用户协议记录',
-            'operation_time' => date('Y-m-d H:i:s')
-        ]);
-    }
-
     /**
      * 添加用户操作记录
      * @param $uid

app/controller/api/Auth.php

@@ -472,6 +472,10 @@ class Auth extends BaseController
         $tokenInfo = $repository->createToken($user);
 
         $repository->loginAfter($user);
+        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_model', 1)->where('operation_type', 1)->find();
+        if (!$useragree){
+            $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -1621,7 +1625,10 @@ class Auth extends BaseController
         // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
-        $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_model', 1)->where('operation_type', 1)->find();
+        if (!$useragree){
+            $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -1782,6 +1789,10 @@ class Auth extends BaseController
         }
         if(isset($result['code']) && $result['code'] == 200){
             $user = $repository->accountByUser($result['user']['account']);
+            $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_model', 1)->where('operation_type', 1)->find();
+            if (!$useragree){
+                $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+            }
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
             if($this->source=='yhc'){
@@ -1913,7 +1924,10 @@ class Auth extends BaseController
 
             $tokenInfo = $repository->createToken($user);
             $repository->loginAfter($user);
-
+            $useragree = Db::name('user_operating_record')->where('uid', $user->uid)->where('operation_type', 1)->where('operation_model', 1)->find();
+            if (!$useragree){
+                $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
+            }
             return app('json')->success($repository->returnToken($user, $tokenInfo));
         }else{
             return app('json')->fail("绑定失败");