From ee5f7f8a81f5fa159a95d53c218c6306161f780b Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Tue, 5 Dec 2023 18:37:32 +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=92=8C=E7=BB=8F=E9=94=80=E5=95=86=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E5=88=9B=E7=AD=89=E7=BA=A7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86=E5=92=8C=E7=BB=8F=E9=94=80=E5=95=86=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=96=87=E5=88=9B=E7=AD=89=E7=BA=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/commission/src/admin/AgentController.php | 3 +++ plugins/commission/src/models/Agents.php | 3 ++- .../team-dividend/src/admin/TeamAgencyController.php | 10 +++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/commission/src/admin/AgentController.php b/plugins/commission/src/admin/AgentController.php index 451ab54d..137eb4cd 100644 --- a/plugins/commission/src/admin/AgentController.php +++ b/plugins/commission/src/admin/AgentController.php @@ -257,6 +257,7 @@ class AgentController extends BaseController '昵称', '姓名/手机', '分销商等级/下级分销商人数', + '文创等级', '累计佣金/已打款佣金', '关注', '黑名单' @@ -264,6 +265,7 @@ class AgentController extends BaseController foreach ($export_model->builder_model as $key => $item) { $lowers = Agents::getLower($item['member_id'], '', true)->count(); $level_name = $item['agent_level'] ? $item['agent_level']['name'] : AgentLevel::getDefaultLevelName(); + $cultural_level_name = $item['cultural_level'] ? $item['cultural_level']['name'] : AgentLevel::getDefaultLevelName(); $export_data[$key + 1] = [ $item['member_id'], $item->toParent->username ?: '总店', @@ -273,6 +275,7 @@ class AgentController extends BaseController $item['member']['username'], $item['member']['realname'].'/'.$item['member']['mobile'], $level_name.'/'.$lowers, + $cultural_level_name, $item['commission_total'].'/'.$item['commission_pay'], $item['fans']['follow'] ? '已关注' : '未关注', $item['is_black'] ? '是' : '否', diff --git a/plugins/commission/src/models/Agents.php b/plugins/commission/src/models/Agents.php index 98440345..11e2f44e 100644 --- a/plugins/commission/src/models/Agents.php +++ b/plugins/commission/src/models/Agents.php @@ -203,7 +203,8 @@ class Agents extends BaseModel } } if ($search['level'] || $search['level'] === 0 || $search['level'] === '0') { - $agentModel->where('agent_level_id', $search['level']); + $agentModel->where('agent_level_id', $search['level']) + ->orWhere('cultural_level_id', $search['level']); } if ($search['black'] >= '0') { $agentModel->where('is_black', $search['black']); diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php index 96830fc6..fcca5c37 100644 --- a/plugins/team-dividend/src/admin/TeamAgencyController.php +++ b/plugins/team-dividend/src/admin/TeamAgencyController.php @@ -88,8 +88,6 @@ class TeamAgencyController extends BaseController $endtime = strtotime($parames['times']['end']); } } - $level = TeamDividendLevelModel::getList()->get(); - $culturalLevel = TeamDividendLevelModel::getList()->get(); // 获取所有经销商的排名信息 $rankList = TeamDividendLevelModel::getRanking(); // 获取每个经销商的赠送名额 @@ -130,6 +128,10 @@ class TeamAgencyController extends BaseController },$rankList)); } + + $level = TeamDividendLevelModel::getList()->where('level_type',0)->get(); + $culturalLevel = TeamDividendLevelModel::getList()->where('level_type',1)->get(); + return view('Yunshop\TeamDividend::admin.team-agency', [ 'list' => $list, 'endtime' => $endtime, @@ -226,7 +228,7 @@ class TeamAgencyController extends BaseController } } } - $export_data[0] = ['ID', '会员', '推荐人会员ID', '成为代理时间', '推荐人姓名', '推荐人手机号', '经销商', '手机号','等级', '一级（直系）总经销商人数', '分红比例', '已结算分红', '未结算分红', '累计结算分红','团队业绩','团队商品销量']; + $export_data[0] = ['ID', '会员', '推荐人会员ID', '成为代理时间', '推荐人姓名', '推荐人手机号', '经销商', '手机号','等级', '文创等级', '一级（直系）总经销商人数', '分红比例', '已结算分红', '未结算分红', '累计结算分红','团队业绩','团队商品销量']; foreach ($list as $key => $item) { if (!empty($item['status'])) { $status = '已使用'; @@ -252,6 +254,7 @@ class TeamAgencyController extends BaseController $item['dividend_open'] = 0; $item['dividend_total'] = $item['has_many_team_dividend'][2]['total_amount'] + $item['has_many_team_dividend'][1]['total_amount'] + $item['has_many_team_dividend'][0]['total_amount']?:0; + $export_data[$key + 1] = [ $item['id'], $item['has_one_member']['uid'], @@ -262,6 +265,7 @@ class TeamAgencyController extends BaseController $item['has_one_member']['username'], $item['has_one_member']['mobile'], $item['has_one_level']['level_name'], + $item['cultural_level']['level_name'], $item['total'], $item['has_one_level']['dividend_ratio'], $item['dividend_final'],