Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -564,17 +564,21 @@ class Auth extends BaseController
     /**
      * 绑定邀请人
      */
-    public function bindSpread(UserRepository $repository)
+    public function registerBindSpread(UserRepository $repository)
     {
         $data = $this->request->params(['uid','spread_phone']);
 
         $user=$repository->accountByUser($data['uid']);
         $uid=$user['uid'];
+        $spreadphone=$user['spread_phone'];
 
         if (empty($data['spread_phone'])) {
             return app('json')->fail('推荐人手机号不能为空');
         }
 
+        $spread_user=Db::name('user')->where('phone',$spreadphone)->field('uid')->find();
+        $spreadUid=$spread_user['uid'];
+
         $spread_user = $repository->accountByUser($data['spread_phone']);
         if (!$spread_user) {
             return app('json')->fail('推荐人手机号不存在');
@@ -583,6 +587,22 @@ class Auth extends BaseController
         if ($spread_user['uid'] == $uid) {
             return app('json')->fail('不能绑定自己为推荐人');
         }
+        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 1);
+
+        $user->spread_uid = $spreadUid;
+        $user->spread_time = date('Y-m-d H:i:s');
+        if($spreadUid){
+            $user->mer_id = Db::name('user')->where('uid',$spreadUid)->value('mer_id');
+        }
+        $this->dao->update($spreadUid, [
+            'spread_count' => Db::raw('spread_count +1')
+        ]);
+        $user->save();
+        //TODO 推广人月榜
+        Cache::zincrby('s_top_' . date('Y-m'), 1, $spreadUid);
+        //TODO 推广人周榜
+        Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
+        $this->spread_log($user,$spreadUid);
 
 
         $repository->bindSpread($user, intval($spread_user['uid']));
@@ -591,7 +611,6 @@ class Auth extends BaseController
     }
 
 
-
     /**
      * 手机号找回密码
      * @param UserRepository $repository

route/api.php

@@ -943,8 +943,8 @@ Route::group('api/', function () {
     Route::post('auth/yijianlogin', 'api.Auth/yijianlogin');
     //短信注册
     Route::post('auth/register', 'api.Auth/register');
-    //绑定邀请人
-    Route::post('auth/bindSpread', 'api.Auth/bindSpread');
+    //注册后绑定邀请人
+    Route::post('auth/registerBindSpread', 'api.Auth/registerBindSpread');
     //测试账号
     Route::post('auth/register_all', 'api.Auth/register_all');
     //java商户端调用用户注册