diff --git a/application/admin/view/shopro/commission/agent/detail.html b/application/admin/view/shopro/commission/agent/detail.html index f08cb60..7e3d873 100644 --- a/application/admin/view/shopro/commission/agent/detail.html +++ b/application/admin/view/shopro/commission/agent/detail.html @@ -412,9 +412,13 @@ {if $auth->check('shopro/commission/agent/edit')} - - +
+ + + 已允许 (达标自动晋升) + ⚠️ 已锁定 (禁止自动晋升) +
{/if}
@@ -578,7 +582,7 @@
- 已锁定升级 + ⚠️ 升级已被锁定(禁止自动晋升) ✓ 晋升条件全部达成 @@ -1047,8 +1051,14 @@ value: 'id', label: 'name', children: 'children', checkStrictly: true, emitPath: true }" clearable filterable style="width:100%" @change="onIdentityAreaChange"> - + +
+ ⚠️ 已开启锁定:该分销商将禁止自动升级(即使满足业绩条件也不会晋升) +
+
+ ✓ 未锁定:正常允许分销商根据业绩达标自动晋升 +
diff --git a/application/admin/view/shopro/commission/agent/index.html b/application/admin/view/shopro/commission/agent/index.html index f81fd12..831a117 100644 --- a/application/admin/view/shopro/commission/agent/index.html +++ b/application/admin/view/shopro/commission/agent/index.html @@ -63,7 +63,7 @@
{{ scope.row.role_names?.venue || '酒道馆' }} {{ scope.row.role_names?.county || '区县代理' }} - {{ scope.row.role_names?.partner || '合伙股东' }} + {{ scope.row.role_names?.partner || '合伙人' }}
@@ -279,8 +279,14 @@ }" clearable filterable style="width:100%" @change="onIdentityAreaChange">
编码:{{ identity.form.county_code || '-' }}
- + +
+ ⚠️ 已开启锁定:该分销商将禁止自动升级(即使满足业绩条件也不会晋升) +
+
+ ✓ 未锁定:正常允许分销商根据业绩达标自动晋升 +
diff --git a/tests/test_agent_upgrade_cumulative.php b/tests/test_agent_upgrade_cumulative.php index 7ba05a3..fd18c08 100644 --- a/tests/test_agent_upgrade_cumulative.php +++ b/tests/test_agent_upgrade_cumulative.php @@ -55,8 +55,8 @@ use app\admin\model\shopro\commission\Level as LevelModel; echo "=== 开始分销商升级规则验证 ===" . PHP_EOL; -// 1. 获取目标测试账号(User ID 8) -$userId = 8; +// 1. 获取目标测试账号(默认为 User ID 17) +$userId = intval($argv[1] ?? 17); $agent = AgentModel::where('user_id', $userId)->find(); if (!$agent) { die("未找到用户 ID {$userId} 的分销商记录\n");