feat: 支持角色身份自定义名称全链路配置与动态展示
这个提交包含在:
@@ -20,7 +20,7 @@ class PartnerAccept extends Command
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('shopro:partner:accept')
|
||||
->setDescription('跑通合伙股东验收剧本:V5极差/平级、馆县拆分、30日暂停、退款、日结');
|
||||
->setDescription('跑通收益中心全角色验收剧本:V5极差/平级、馆县拆分、30日暂停、退款、日结');
|
||||
}
|
||||
|
||||
protected function execute(Input $input, Output $output)
|
||||
|
||||
@@ -13,7 +13,7 @@ class PartnerInstall extends Command
|
||||
protected function configure()
|
||||
{
|
||||
$this->setName('shopro:partner:install')
|
||||
->setDescription('导入合伙股东表结构/配置,并升级后台菜单');
|
||||
->setDescription('导入收益中心表结构/配置,并升级后台菜单');
|
||||
}
|
||||
|
||||
protected function execute(Input $input, Output $output)
|
||||
|
||||
@@ -15,7 +15,7 @@ class PartnerSettle extends Command
|
||||
$this->setName('shopro:partner:settle')
|
||||
->addOption('date', 'd', Option::VALUE_OPTIONAL, '结算日期 Y-m-d,默认昨天')
|
||||
->addOption('rerun', 'r', Option::VALUE_NONE, '删除当天日结后重算')
|
||||
->setDescription('合伙股东日结(马豆/馆县均分/兑换券释放)');
|
||||
->setDescription('收益中心日结(马豆/馆县均分/兑换券释放)');
|
||||
}
|
||||
|
||||
protected function execute(Input $input, Output $output)
|
||||
|
||||
@@ -72,7 +72,7 @@ class Partner
|
||||
$service->refundPartial($order, $item);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
format_log_error($e, 'Partner.orderItemRefundAfter', '合伙股东退款处理异常: ' . $e->getMessage());
|
||||
format_log_error($e, 'Partner.orderItemRefundAfter', '收益中心退款处理异常: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,10 @@ class IdentityService
|
||||
'identities' => [],
|
||||
'identity_text' => '',
|
||||
'is_partner' => false,
|
||||
'is_advanced' => false,
|
||||
'maker_level_name' => '',
|
||||
'role_names' => PartnerConfig::roleNames(),
|
||||
'custom_role_names' => PartnerConfig::roleNames(),
|
||||
];
|
||||
if (!$agent) {
|
||||
return $empty;
|
||||
@@ -25,6 +28,13 @@ class IdentityService
|
||||
$isCounty = intval(is_array($agent) ? ($agent['is_county'] ?? 0) : ($agent->is_county ?? 0));
|
||||
$isPartner = intval(is_array($agent) ? ($agent['is_partner'] ?? 0) : ($agent->is_partner ?? 0));
|
||||
|
||||
$roleNames = PartnerConfig::roleNames();
|
||||
$tasterName = $roleNames['taster'];
|
||||
$makerBaseName = $roleNames['maker'];
|
||||
$venueName = $roleNames['venue'];
|
||||
$countyName = $roleNames['county'];
|
||||
$partnerName = $roleNames['partner'];
|
||||
|
||||
$identities = [];
|
||||
$parts = [];
|
||||
$makerLevelName = '';
|
||||
@@ -33,25 +43,25 @@ class IdentityService
|
||||
$identities[] = 'taster';
|
||||
} elseif ($level >= 2) {
|
||||
$identities[] = 'maker';
|
||||
$makerLevelName = '创客V' . ($level - 1);
|
||||
$makerLevelName = $makerBaseName . 'V' . ($level - 1);
|
||||
$parts[] = $makerLevelName;
|
||||
}
|
||||
if ($isVenue) {
|
||||
$identities[] = 'venue';
|
||||
$parts[] = '酒道馆';
|
||||
$parts[] = $venueName;
|
||||
}
|
||||
if ($isCounty) {
|
||||
$identities[] = 'county';
|
||||
$parts[] = '区县代理';
|
||||
$parts[] = $countyName;
|
||||
}
|
||||
if ($isPartner) {
|
||||
$identities[] = 'partner';
|
||||
$parts[] = '合伙股东';
|
||||
$parts[] = $partnerName;
|
||||
}
|
||||
|
||||
// 若无进阶角色身份且等级为1,则身份为基础品酒师
|
||||
// 若无进阶角色身份且等级为1,则身份为基础品酒师/自定义基础名称
|
||||
if (empty($parts) && $level == 1) {
|
||||
$parts[] = '品酒师';
|
||||
$parts[] = $tasterName;
|
||||
}
|
||||
|
||||
$isAdvanced = ($level >= 2) || ($isVenue == 1) || ($isCounty == 1) || ($isPartner == 1);
|
||||
@@ -62,6 +72,8 @@ class IdentityService
|
||||
'is_partner' => (bool) $isPartner,
|
||||
'is_advanced' => $isAdvanced,
|
||||
'maker_level_name' => $makerLevelName,
|
||||
'role_names' => $roleNames,
|
||||
'custom_role_names' => $roleNames,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -121,11 +133,15 @@ class IdentityService
|
||||
{
|
||||
if (!$agent) {
|
||||
$baseRate = PartnerConfig::get('partner_madow_base_rate', '0.00000075');
|
||||
$roleNames = PartnerConfig::roleNames();
|
||||
return [
|
||||
'identity_text' => '',
|
||||
'identities' => [],
|
||||
'is_partner' => false,
|
||||
'is_advanced' => false,
|
||||
'maker_level_name' => '',
|
||||
'role_names' => $roleNames,
|
||||
'custom_role_names' => $roleNames,
|
||||
'madow' => '0',
|
||||
'madow_rate' => self::formatRate($baseRate),
|
||||
'madow_value' => '0.00',
|
||||
@@ -136,12 +152,15 @@ class IdentityService
|
||||
];
|
||||
}
|
||||
$full = self::attachAgent($agent, $rate);
|
||||
$roleNames = $full['role_names'] ?? PartnerConfig::roleNames();
|
||||
return [
|
||||
'identity_text' => $full['identity_text'],
|
||||
'identities' => $full['identities'],
|
||||
'is_partner' => $full['is_partner'],
|
||||
'is_advanced' => $full['is_advanced'] ?? false,
|
||||
'maker_level_name' => $full['maker_level_name'],
|
||||
'role_names' => $roleNames,
|
||||
'custom_role_names' => $roleNames,
|
||||
'madow' => $full['madow'],
|
||||
'madow_rate' => $full['madow_rate'],
|
||||
'madow_value' => $full['madow_value'],
|
||||
|
||||
@@ -68,6 +68,17 @@ class PartnerConfig
|
||||
return $map;
|
||||
}
|
||||
|
||||
public static function roleNames()
|
||||
{
|
||||
return [
|
||||
'taster' => trim((string) self::get('partner_role_name_taster', '品酒师')) ?: '品酒师',
|
||||
'maker' => trim((string) self::get('partner_role_name_maker', '创客')) ?: '创客',
|
||||
'venue' => trim((string) self::get('partner_role_name_venue', '酒道馆')) ?: '酒道馆',
|
||||
'county' => trim((string) self::get('partner_role_name_county', '区县代理')) ?: '区县代理',
|
||||
'partner' => trim((string) self::get('partner_role_name_partner', '合伙股东')) ?: '合伙股东',
|
||||
];
|
||||
}
|
||||
|
||||
public static function rewardTypeText($type)
|
||||
{
|
||||
$map = self::rewardTypeMap();
|
||||
@@ -76,17 +87,22 @@ class PartnerConfig
|
||||
|
||||
public static function rewardTypeMap()
|
||||
{
|
||||
$roles = self::roleNames();
|
||||
$maker = $roles['maker'];
|
||||
$venue = $roles['venue'];
|
||||
$county = $roles['county'];
|
||||
|
||||
return [
|
||||
'push3' => '推荐开拓奖',
|
||||
'maker_diff' => '创客进阶奖',
|
||||
'maker_peer' => '创客协同奖',
|
||||
'maker_overtaken' => '创客卓越奖',
|
||||
'team_venue' => '酒道馆运营奖',
|
||||
'team_county' => '区县统筹奖',
|
||||
'venue_peer' => '酒道馆协同奖',
|
||||
'county_peer' => '区县协同奖',
|
||||
'venue_share' => '酒道馆加权奖励',
|
||||
'county_share' => '区县加权奖励',
|
||||
'maker_diff' => $maker . '进阶奖',
|
||||
'maker_peer' => $maker . '协同奖',
|
||||
'maker_overtaken' => $maker . '卓越奖',
|
||||
'team_venue' => $venue . '运营奖',
|
||||
'team_county' => $county . '统筹奖',
|
||||
'venue_peer' => $venue . '协同奖',
|
||||
'county_peer' => $county . '协同奖',
|
||||
'venue_share' => $venue . '加权奖励',
|
||||
'county_share' => $county . '加权奖励',
|
||||
'madow_share' => '每日贡献马豆',
|
||||
'voucher_grant' => '消费补贴发放',
|
||||
'voucher_release' => '消费补贴到账',
|
||||
@@ -97,13 +113,18 @@ class PartnerConfig
|
||||
|
||||
public static function skipReasonText($code, $forUser = false)
|
||||
{
|
||||
$roles = self::roleNames();
|
||||
$maker = $roles['maker'];
|
||||
$venue = $roles['venue'];
|
||||
$county = $roles['county'];
|
||||
|
||||
$inner = [
|
||||
'no_parent' => '无推荐上级',
|
||||
'self_buy' => '本人自购',
|
||||
'inactive_30d' => '受益人 30 日无自购',
|
||||
'not_maker' => '不是创客身份',
|
||||
'not_venue' => '不是酒道馆身份',
|
||||
'not_county' => '不是区县代理身份',
|
||||
'not_maker' => '不是' . $maker . '身份',
|
||||
'not_venue' => '不是' . $venue . '身份',
|
||||
'not_county' => '不是' . $county . '身份',
|
||||
'cap_not_higher' => '等级未超过基数水位',
|
||||
'already_settled' => '幂等跳过',
|
||||
'partner_goods_off' => '商品未参与',
|
||||
|
||||
在新工单中引用
屏蔽一个用户