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 = [ [