|
@@ -79,7 +79,7 @@ class Auth extends BaseController
|
|
|
* @author xaboy
|
|
|
* @day 2020/6/1
|
|
|
*/
|
|
|
- public function login(UserRepository $repository)
|
|
|
+ public function login(UserRepository $repository,StorePercentageRepository $store_percentage)
|
|
|
{
|
|
|
$account = $this->request->param('account');
|
|
|
$auth_token = $this->request->param('auth_token');
|
|
@@ -99,7 +99,7 @@ class Auth extends BaseController
|
|
|
}
|
|
|
$user = $repository->mainUser($user);
|
|
|
$pid = $this->request->param('spread', 0);
|
|
|
- $repository->bindSpread($user, intval($pid));
|
|
|
+ $repository->bindSpread($user, intval($pid),0,$store_percentage);
|
|
|
|
|
|
$tokenInfo = $repository->createToken($user);
|
|
|
$repository->loginAfter($user);
|
|
@@ -190,7 +190,7 @@ class Auth extends BaseController
|
|
|
* @author xaboy
|
|
|
* @day 2020-05-11
|
|
|
*/
|
|
|
- public function auth()
|
|
|
+ public function auth(StorePercentageRepository $store_percentage)
|
|
|
{
|
|
|
if (systemConfig('is_phone_login') === '1') {
|
|
|
return app('json')->fail('请绑定手机号');
|
|
@@ -217,7 +217,7 @@ class Auth extends BaseController
|
|
|
$user[1] = $userRepository->mainUser($user[1]);
|
|
|
|
|
|
$pid = $this->request->param('spread', 0);
|
|
|
- $userRepository->bindSpread($user[1], intval($pid));
|
|
|
+ $userRepository->bindSpread($user[1], intval($pid),0,$store_percentage);
|
|
|
|
|
|
$tokenInfo = $userRepository->createToken($user[1]);
|
|
|
$userRepository->loginAfter($user[1]);
|
|
@@ -442,7 +442,7 @@ class Auth extends BaseController
|
|
|
$repository->syncBaseAuth($auth, $user);
|
|
|
}
|
|
|
$user = $repository->mainUser($user);
|
|
|
- $repository->bindSpread($user, intval($data['spread']));
|
|
|
+ $repository->bindSpread($user, intval($data['spread']),0,$store_percentage);
|
|
|
|
|
|
$tokenInfo = $repository->createToken($user);
|
|
|
$repository->loginAfter($user);
|