feat: 支持生成全部项目通用卡 (project_id=0)

This commit is contained in:
root committed 2026-10-12 15:02:58 +08:00
1 parent b4a20080dd
commit cf65cbd72d
5 files changed
+132 -50

No files matched your search

@@ -319,6 +319,25 @@ class AuthorizationController extends Controller
$this->error('卡密不存在');
}
// 通用卡(project_id=0):授权归属到请求指定的项目
$reqProjectId = (int) ($input['project_id'] ?? 0);
$authProjectId = (int) $card['project_id'];
$authProjectName = $card['project_name'] ?? '';
if ($authProjectId === 0) {
if ($reqProjectId <= 0) {
$this->error('通用卡激活请传入 project_id 指定项目');
}
$proj = $db->fetch(
"SELECT name FROM {$db->table('projects')} WHERE id = ? AND deleted_at IS NULL",
[$reqProjectId]
);
if (!$proj) {
$this->error('指定的项目不存在');
}
$authProjectId = $reqProjectId;
$authProjectName = $proj['name'];
}
if ($card['status'] === 'disabled') {
$this->error('该卡密已被禁用');
}
@@ -375,8 +394,8 @@ class AuthorizationController extends Controller
// 如果当前用户是代理,使用此类卡密需按代理价格扣费
if ($currentRole === 'agent' && $currentUserId > 0) {
$cardTypeForCost = $db->fetch(
"SELECT agent_cost FROM {$db->table('card_types')} WHERE id = ? AND project_id = ?",
[$card['card_type_id'], $card['project_id']]
"SELECT agent_cost FROM {$db->table('card_types')} WHERE id = ?",
[$card['card_type_id']]
);
if (!$cardTypeForCost || (float) $cardTypeForCost['agent_cost'] <= 0) {
@@ -403,10 +422,10 @@ class AuthorizationController extends Controller
// 检查当前机器人QQ在同一项目下是否已有授权(未撤销),有则续费
$existingAuth = $db->fetch(
"SELECT * FROM {$db->table('authorizations')}
WHERE project_id = ? AND bot_qq = ? AND status != 'revoked'
ORDER BY expire_time IS NULL DESC, expire_time DESC, id DESC
LIMIT 1",
[$card['project_id'], $botQq]
WHERE project_id = ? AND bot_qq = ? AND status != 'revoked'
ORDER BY expire_time IS NULL DESC, expire_time DESC, id DESC
LIMIT 1",
[$authProjectId, $botQq]
);
$agentId = (int) ($card['use_user_id'] ?? 0);
@@ -459,8 +478,8 @@ class AuthorizationController extends Controller
[
$card['id'],
$card['card_key'],
$card['project_id'],
$card['project_name'] ?? '',
$authProjectId,
$authProjectName,
$botQq,
$contactQq,
$contactName,
@@ -495,8 +514,8 @@ class AuthorizationController extends Controller
'bot_qq' => $botQq,
'contact_qq' => $contactQq,
'contact_name'=> $contactName,
'project_id' => (int) $card['project_id'],
'project_name'=> $card['project_name'] ?? '',
'project_id' => $authProjectId,
'project_name'=> $authProjectName,
'expire_time' => $newExpireTime,
'is_renew' => true,
], '续费成功');
@@ -513,8 +532,8 @@ class AuthorizationController extends Controller
[
$card['id'],
$card['card_key'],
$card['project_id'],
$card['project_name'] ?? '',
$authProjectId,
$authProjectName,
$botQq,
$contactQq,
$contactName,
@@ -553,8 +572,8 @@ class AuthorizationController extends Controller
'bot_qq' => $botQq,
'contact_qq' => $contactQq,
'contact_name'=> $contactName,
'project_id' => (int) $card['project_id'],
'project_name'=> $card['project_name'] ?? '',
'project_id' => $authProjectId,
'project_name'=> $authProjectName,
'expire_time' => $expireTime,
'is_renew' => false,
], '授权成功');