Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -514,12 +514,12 @@ class Auth extends BaseController
             }
         }
         // Log::info($data);
-        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,0);
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
 
-        $repository->bindSpread($user, intval($data['spread']));
+//        $repository->bindSpread($user, intval($data['spread']));
 //        $repository->spread_log($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
@@ -538,26 +538,70 @@ class Auth extends BaseController
 //                }
 //            }
 //        }
-        if ($type == "marketing"){
-            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
-            $spread_list = explode(',',$spread['spread_list']);
-            if (!empty($spread_list)){
+//        if ($type == "marketing"){
+//            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
+//            $spread_list = explode(',',$spread['spread_list']);
+//            if (!empty($spread_list)){
+//                $spread_list[] = "[" . $spread['uid'] . "]";
+//            }else{
+//                array_push($spread_list,"[".$spread['uid']."]");
+//            }
+//            $spread_list = array_filter($spread_list);
+//                    $data = [
+//                "uid" => $user->uid,
+//                "spread_uid" => $spread['uid'],
+//                "spread_list" => implode(",",$spread_list)
+//            ];
+//            Db::name("MarketingUser") -> insert($data);
+//        }
+
+        return app('json')->success($repository->returnToken($user, $tokenInfo));
+    }
+    public function bindSpread(UserRepository $repository)
+    {
+        $data = $this->request->params(['spread_phone']);
+        $uid = $this->request->user()->uid;
+
+        // 查询推荐人
+        $spreadUser = $repository->accountByUser($data['spread_phone']);
+        if (!$spreadUser) {
+            return app('json')->fail('推荐人手机号不存在');
+        }
+        if ($spreadUser['uid'] == $uid) {
+            return app('json')->fail('不能绑定自己为邀请人');
+        }
+
+        // 绑定推荐人
+        $repository->bindSpreadByUid($uid, intval($spreadUser['uid']));
+
+        // 如果是 marketing 类型用户，执行营销关系逻辑
+        if ($this->source == "marketing") {
+            $spread = Db::name("User")
+                ->alias("u")
+                ->leftjoin("MarketingUser mu", "u.uid = mu.uid")
+                ->where("u.uid", $spreadUser['uid'])
+                ->field("u.uid,mu.spread_list")
+                ->find();
+
+            $spread_list = explode(',', $spread['spread_list']);
+            if (!empty($spread_list)) {
                 $spread_list[] = "[" . $spread['uid'] . "]";
-            }else{
-                array_push($spread_list,"[".$spread['uid']."]");
+            } else {
+                array_push($spread_list, "[" . $spread['uid'] . "]");
             }
             $spread_list = array_filter($spread_list);
-            $data = [
-                "uid" => $user->uid,
-                "spread_uid" => $spread['uid'],
-                "spread_list" => implode(",",$spread_list)
-            ];
-            Db::name("MarketingUser") -> insert($data);
+
+            Db::name("MarketingUser")->insert([
+                "uid"         => $uid,
+                "spread_uid"  => $spread['uid'],
+                "spread_list" => implode(",", $spread_list)
+            ]);
         }
 
-        return app('json')->success($repository->returnToken($user, $tokenInfo));
+        return app('json')->success('邀请人绑定成功');
     }
 
+
     /**
      * 手机号找回密码
      * @param UserRepository $repository
@@ -1596,11 +1640,11 @@ class Auth extends BaseController
         if (!$this->checkSmsCode($data['phone'], $data['sms_code'])) {
             return app('json')->fail('验证码不正确');
         }
+        return app('json')->success([
+            'msg' => '验证码验证通过，请填写推荐人手机号完成注册',
+            'phone' => $data['phone']
+        ]);
 
-        $user = $repository->registr($data['phone'], null, 'h5', '', '', 1, $data['spread_uid']);
-        $user = $repository->mainUser($user);
-        $tokenInfo = $repository->loginAfter($user);
-        return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
 

route/api.php

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