From 44bbc0b2316d61be03559e5b38cd028499851a04 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 24 Feb 2023 15:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/fenxiao/api/controller/Fenxiao.php | 11 +++++++++++
 addon/fenxiao/model/Fenxiao.php          |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addon/fenxiao/api/controller/Fenxiao.php b/addon/fenxiao/api/controller/Fenxiao.php
index d4ebbcc6..a2da1304 100644
--- a/addon/fenxiao/api/controller/Fenxiao.php
+++ b/addon/fenxiao/api/controller/Fenxiao.php
@@ -88,6 +88,17 @@ class Fenxiao extends BaseApi
             if (!empty($one_in_progress_commission[ 'data' ][ 'commission' ])) $info[ 'data' ][ 'in_progress_money' ] += $one_in_progress_commission[ 'data' ][ 'commission' ];
             if (!empty($two_in_progress_commission[ 'data' ][ 'commission' ])) $info[ 'data' ][ 'in_progress_money' ] += $two_in_progress_commission[ 'data' ][ 'commission' ];
             if (!empty($three_in_progress_commission[ 'data' ][ 'commission' ])) $info[ 'data' ][ 'in_progress_money' ] += $three_in_progress_commission[ 'data' ][ 'commission' ];
+
+            // 判断：是否可以申请升级
+            $info['data']['is_apply_upgrade'] = 0;
+            $currentLevelNum = @(int)($info['data']['condition']['fenxiao']['level_num'] ?? 0);
+            $parentLevelId = $info['data']['parent_level_id'] ?? 0;
+            if($currentLevelNum == 0 && $parentLevelId > 0){
+                $parentLevelNum = Db::name('fenxiao_level')->where('level_id',$info['data']['parent_level_id'])->value('level_num');
+                if($parentLevelNum == 1) $info['data']['is_apply_upgrade'] = 1;
+            }
+
+
         }
         return $this->response($info);
     }
diff --git a/addon/fenxiao/model/Fenxiao.php b/addon/fenxiao/model/Fenxiao.php
index c483952d..75b4554b 100644
--- a/addon/fenxiao/model/Fenxiao.php
+++ b/addon/fenxiao/model/Fenxiao.php
@@ -134,7 +134,7 @@ class Fenxiao extends BaseModel
     {
         $condition[] = [ 'f.is_delete', '=', 0 ];
 
-        $field = 'f.*,pf.fenxiao_name as parent_name,nm.username,nm.nickname,nm.headimg,nm.order_num,nm.order_money,fl.level_num';
+        $field = 'f.*,pf.fenxiao_name as parent_name,pf.level_id as parent_level_id,nm.username,nm.nickname,nm.headimg,nm.order_num,nm.order_money,fl.level_num';
         $alias = 'f';
         $join = [
             [