Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -561,44 +561,41 @@ class Auth extends BaseController
         return app('json')->success($result);
 
     }
+
     /**
-     * 绑定邀请人
+     * 用户注册后绑定邀请人
      */
     public function registerBindSpread(UserRepository $repository)
     {
-        $data = $this->request->params(['uid','spread_phone']);
-
-        $user=$repository->accountByUser($data['uid']);
-        $uid=$user['uid'];
-
+        $data = $this->request->params(['uid', 'spread_phone']);
+        $user = Db::name('user')->where('uid', $data['uid'])->field('uid,spread_uid')->find();
+        if (!$user) {
+            return app('json')->fail('注册失败,用户不存在');
+        }
         if (empty($data['spread_phone'])) {
             return app('json')->fail('推荐人手机号不能为空');
         }
-
-        $spread_user = Db::name('user')->where('phone', $data['spread_phone'])->field('uid,mer_id')->find();
-        $spreadUid=$spread_user['uid'];
+        $spread_user = Db::name('user')->where('phone', $data['spread_phone'])->field('uid')->find();
         if (!$spread_user) {
             return app('json')->fail('推荐人手机号不存在');
         }
-
-        if ($spread_user['uid'] == $uid) {
+        if(empty($data['uid'])==$user['uid']){
             return app('json')->fail('不能绑定自己为推荐人');
         }
 
-        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 1);
-        Db::name('user')->where('uid', $uid)->update(['spread_uid'  => $spreadUid, 'spread_time' => date('Y-m-d H:i:s'), 'mer_id'=> $spread_user['mer_id'] ?? 0 ]);
+        $spreadUid = $spread_user['uid'];//绑定推荐人
+        Db::name('user')->where('uid', $user['uid'])->update(['spread_uid'  => $spreadUid, 'spread_time' => date('Y-m-d H:i:s')]);
 
-        $this->dao->update($spreadUid, [
-            'spread_count' => Db::raw('spread_count +1')
-        ]);
+        //给推荐人下级+1
+        Db::name('user')->where('uid', $spreadUid)->update(['spread_count' => Db::raw('spread_count + 1')]);
+
+        $this->sign_add($spreadUid, 30,1,'邀请好友注册奖励积分','','', '', 1, '', 1);
 
-        //TODO 推广人月榜
         Cache::zincrby('s_top_' . date('Y-m'), 1, $spreadUid);
-        //TODO 推广人周榜
         Cache::zincrby('s_top_' . monday(), 1, $spreadUid);
-        $this->spread_log($user,$spreadUid);
-
+        $this->spread_log($user, $spreadUid);
         return app('json')->success('绑定成功');
+
     }