Merge remote-tracking branch 'origin/master'

.vscode/sftp.json

@@ -0,0 +1,12 @@
+{
+    "name": "8.141.0.149",
+    "host": "8.141.0.149",
+    "protocol": "sftp",
+    "port": 22,
+    "username": "root",
+    "password": "hhq15801255760",
+    "remotePath": "/data/www/api.hebeiyhc.com/web",
+    "uploadOnSave": true,
+    "useTempFile": false,
+    "openSsh": false
+}

app/common/repositories/user/UserRepository.php

@@ -962,6 +962,9 @@ class UserRepository extends BaseRepository
 //
 //            Queue::push(SendNewPeopleCouponJob::class, $user->uid);
 
+            //赠送积分 注册送10积分
+            $this->sign_add($user['uid'], 10,1,'注册送10积分','','');
+
             Db::commit();
             return $user;
         } catch (\Exception $e) {

app/controller/api/user/User.php

@@ -735,9 +735,15 @@ class User extends BaseController
             if ($res) {
                 //赠送积分 完善实名送20个积分，同时送邀请人20个积
                 $this->sign_add($member_id, 20,1,'完善实名系统赠送20个积分','','');
+<<<<<<< HEAD
+                $member_info = Db::name('user')->where( array('uid' => $member_id) )->find(); 
+                if($member_info['spread_uid']){
+                     //首次邀请好友奖励积分
+=======
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
                 if($member_info['spread_uid']){
                     //首次邀请好友奖励积分
+>>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
                     $spreadUid = $member_info['spread_uid'];
                     $this->sign_add($spreadUid, 20,1,'好友完善实名系统赠送20个积分','','');
                 }
@@ -752,7 +758,11 @@ class User extends BaseController
     }
 
 
+<<<<<<< HEAD
+        /**
+=======
     /**
+>>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
      * @param int $uid 用户ID
      * @param string $score 积分
      * @param int $status 积分状态