From 4032e97faaa423280c9948f7cf960adba913a2a8 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 8 Apr 2024 10:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=E9=93=BE=E5=92=8C=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=A0=81=E4=BD=BF=E7=94=A8=E6=97=B6=20=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E9=9C=80=E8=A6=81=E5=85=88=E7=94=B3=E8=AF=B7=E8=BD=AC?=
 =?UTF-8?q?=E6=AD=A3=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/user/UserRepository.php | 6 +++---
 app/controller/api/user/Svip.php                | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php
index 4678068..096ccde 100644
--- a/app/common/repositories/user/UserRepository.php
+++ b/app/common/repositories/user/UserRepository.php
@@ -920,10 +920,10 @@ class UserRepository extends BaseRepository
      * @day 2020/6/22
      */
     public function bindSpread(User $user, int $spreadUid){
-        // 获取邀请人  分销商转正申请信息
-        $formalStatus = (int)UserBrokerageApplyFormal::where('uid', $spreadUid)->value('status');
+        // 获取邀请人  分销商转正申请信息 $formalStatus == 1 &&
+        // $formalStatus = (int)UserBrokerageApplyFormal::where('uid', $spreadUid)->value('status');
 
-        if ($formalStatus == 1 && $spreadUid && !$user->spread_uid && $user->uid != $spreadUid && ($spread = $this->dao->get($spreadUid)) && $spread->spread_uid != $user->uid && !$spread->cancel_time) {
+        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']);
             event('user.spread.before', compact('user','spreadUid'));
             Db::transaction(function () use ($spread, $spreadUid, $user, $config) {
diff --git a/app/controller/api/user/Svip.php b/app/controller/api/user/Svip.php
index cd12bc2..966ea09 100644
--- a/app/controller/api/user/Svip.php
+++ b/app/controller/api/user/Svip.php
@@ -347,8 +347,6 @@ class Svip extends BaseController
                 'status' => 2
             ]);
             // 绑定上下级关系
-            $formalStatus = (int)UserBrokerageApplyFormal::where('uid',  (int)$exchangeCodeInfo['activate_uid'])->value('status');
-            if($formalStatus != 1) throw new ValidateException('邀请人身份无效!');
             if((int)$exchangeCodeInfo['activate_uid'] == (int)$uid) throw new ValidateException('邀请人和使用者不能是同一人!');
 
             $bindRes = app()->make(UserRepository::class)->bindSpread($user, (int)$exchangeCodeInfo['activate_uid']);