fix: 通用永久套餐不再出现在公开API与商城

This commit is contained in:
root committed 2026-10-13 09:34:33 +08:00
1 parent 51e1f810a5
commit e9a2ed0d1f
1 file changed
+8 -4
+8 -4
View File
@@ -51,10 +51,12 @@ class PublicController extends Controller
public function cardTypes(int $projectId): void
{
$db = Database::getInstance();
// 本项目套餐 + 通用套餐(project_id=0)
// 本项目套餐 + 通用套餐(project_id=0);隐藏通用永久套餐(不适售)
$types = $db->fetchAll(
"SELECT id, name, description, duration_days, price, original_price, project_id FROM {$db->table('card_types')}
WHERE (project_id = ? OR project_id = 0) AND status = 1
WHERE (project_id = ? OR project_id = 0)
AND status = 1
AND NOT (project_id = 0 AND duration_days = 0)
ORDER BY project_id ASC, sort ASC",
[$projectId]
);
@@ -110,10 +112,12 @@ class PublicController extends Controller
$this->error('项目不存在或已下架');
}
// 验证卡密类型(本项目或通用套餐)
// 验证卡密类型(本项目或通用套餐;排除通用永久套餐)
$cardType = $db->fetch(
"SELECT * FROM {$db->table('card_types')}
WHERE id = ? AND status = 1 AND (project_id = ? OR project_id = 0)",
WHERE id = ? AND status = 1
AND (project_id = ? OR project_id = 0)
AND NOT (project_id = 0 AND duration_days = 0)",
[$cardTypeId, $projectId]
);
if (!$cardType) {