quguofeng 1 year ago
parent
commit
bb003bef0b
2 changed files with 3 additions and 4 deletions
  1. 1 2
      app/common/repositories/user/UserRepository.php
  2. 2 2
      app/controller/api/Auth.php

+ 1 - 2
app/common/repositories/user/UserRepository.php

@@ -933,7 +933,7 @@ class UserRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/22
      */
-    public function bindSpread(User $user, int $spreadUid, int $order_id)
+    public function bindSpread(User $user, int $spreadUid, int $order_id,$store_percentage)
     {
         if ($spreadUid && !$user->spread_uid && $user->uid != $spreadUid && ($spread = $this->dao->get($spreadUid)) && $spread->spread_uid != $user->uid && !$spread->cancel_time) {
             $config = systemConfig(['extension_limit', 'extension_limit_day', 'integral_user_give']);
@@ -967,7 +967,6 @@ class UserRepository extends BaseRepository
             });
             if($order_id){
                 //一级注册折扣百分比
-                $store_percentage = new StorePercentageRepository();
                 $store_percentage->deduction_percentage(1,$user->uid,$order_id);
                 //二级注册折扣百分比
                 if($spread->order_id){

+ 2 - 2
app/controller/api/Auth.php

@@ -546,7 +546,7 @@ class Auth extends BaseController
         }
     }
 
-    public function authLogin()
+    public function authLogin(StorePercentageRepository $store_percentage)
     {
         $auth = $this->request->param('auth');
         $users = $this->authInfo($auth, systemConfig('is_phone_login') !== '1');
@@ -568,7 +568,7 @@ class Auth extends BaseController
         }
         $order_id = $auth['auth']['order_id'] ?? 0;
         if ($auth['auth']['spread'] ?? 0) {
-            $userRepository->bindSpread($user, (int)($auth['auth']['spread']),$order_id);
+            $userRepository->bindSpread($user, (int)($auth['auth']['spread']),$order_id,$store_percentage);
         }
         $tokenInfo = $userRepository->createToken($user);
         $userRepository->loginAfter($user);