Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -570,16 +570,13 @@ class Auth extends BaseController
 
         $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();
+        $spread_user = Db::name('user')->where('phone', $data['spread_phone'])->field('uid,mer_id')->find();
         $spreadUid=$spread_user['uid'];
-
-        $spread_user = $repository->accountByUser($data['spread_phone']);
         if (!$spread_user) {
             return app('json')->fail('推荐人手机号不存在');
         }
@@ -587,26 +584,20 @@ class Auth extends BaseController
         if ($spread_user['uid'] == $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 ]);
 
-        $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']));
-
         return app('json')->success('绑定成功');
     }