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

app/common/repositories/user/UserRepository.php

@@ -4476,14 +4476,33 @@ class UserRepository extends BaseRepository
     }
 
     //记录用户确认了用户协议
-    private function userar($uid){
+    public function userar($uid){
         Db::name('operating_record')->insert([
             'uid' => $uid,
             'operation_model' => '1',
-            'operate_model_type' => '1',
+            'operation_type' => '1',
             'mark' => '用户同意用户协议记录',
             'operation_time' => date('Y-m-d H:i:s')
         ]);
     }
 
+    /**
+     * 添加用户操作记录
+     * @param $uid
+     * @param $model
+     * @param $type
+     * @param $mark
+     * @return void
+     */
+    public function createUserOperatingRecord($uid, $model, $type, $mark)
+    {
+        Db::name('user_operating_record')->insert([
+            'uid' => $uid,
+            'operation_model' => $model,
+            'operation_type' => $type,
+            'mark' => $mark,
+            'operation_time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
 }

app/controller/api/Auth.php

@@ -558,7 +558,7 @@ class Auth extends BaseController
 
         $result = $repository->returnToken($user, $tokenInfo);
         $result['uid'] = $user->uid;
-        $repository->userar($user->uid);
+        $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         return app('json')->success($result);
 
     }
@@ -1621,7 +1621,7 @@ class Auth extends BaseController
         // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
-        $repository->userar($user->uid);
+        $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }