bztang
/
bztang-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：分销商和经销商导出添加文创等级信息 

修复：分销商和经销商搜索文创等级错误
This commit is contained in:
wuhui_zzw 2023-12-05 18:37:32 +08:00
parent 1d7241256c
commit ee5f7f8a81
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/commission/src/admin/AgentController.php
View File

@ -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'] ? '是' : '否',

3
plugins/commission/src/models/Agents.php
View File

@ -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']);

10
plugins/team-dividend/src/admin/TeamAgencyController.php
View File

@ -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'],