Merge branch 'main' of git.opencomputing.cn:yumoqing/kboss

This commit is contained in:
hrx 2026-06-09 15:24:58 +08:00
commit f7e53e1e84
2 changed files with 4 additions and 4 deletions

View File

@ -178,7 +178,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
sql = """ sql = """
SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at
FROM model_usage FROM model_usage
WHERE %s AND bill_status = '0' WHERE %s AND bill_status != '0'
ORDER BY created_at DESC ORDER BY created_at DESC
""" % where_clause """ % where_clause
if limit is not None: if limit is not None:
@ -188,7 +188,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
async def _count_model_usage(sor, conditions): async def _count_model_usage(sor, conditions):
where_clause = ' AND '.join(conditions) if conditions else '1 = 1' where_clause = ' AND '.join(conditions) if conditions else '1 = 1'
sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s AND bill_status = "0"' % where_clause sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s AND bill_status != "0"' % where_clause
return (await sor.sqlExe(sql, {}))[0]['total_count'] return (await sor.sqlExe(sql, {}))[0]['total_count']

View File

@ -155,7 +155,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
sql = """ sql = """
SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at SELECT id, userid, llmid, original_price, orderid, bill_status, usage_content, created_at
FROM model_usage FROM model_usage
WHERE %s AND bill_status = '0' WHERE %s AND bill_status != '0'
ORDER BY created_at DESC ORDER BY created_at DESC
""" % where_clause """ % where_clause
if limit is not None: if limit is not None:
@ -165,7 +165,7 @@ async def _query_model_usage_rows(sor, conditions, limit=None, offset=None):
async def _count_model_usage(sor, conditions): async def _count_model_usage(sor, conditions):
where_clause = ' AND '.join(conditions) if conditions else '1 = 1' where_clause = ' AND '.join(conditions) if conditions else '1 = 1'
sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s' % where_clause sql = 'SELECT COUNT(*) AS total_count FROM model_usage WHERE %s AND bill_status != "0"' % where_clause
return (await sor.sqlExe(sql, {}))[0]['total_count'] return (await sor.sqlExe(sql, {}))[0]['total_count']