main #129

Merged
charles merged 9 commits from main into prod 2026-06-22 14:39:43 +08:00
Showing only changes of commit acd37d0e19 - Show all commits

View File

@ -127,6 +127,10 @@ def _format_amount_summary(summary):
return formatted
def _usage_time_sort_key(item):
return str(item.get('last_usage_time') or '')
def _normalize_usage_row(row, bill_amount_map=None):
usage = _parse_usage_content(row.get('usage_content'))
orderid = row.get('orderid')
@ -341,7 +345,7 @@ def _aggregate_admin_summary(items, user_map, org_map):
or str(usage_time) < str(bucket['first_usage_time'])
):
bucket['first_usage_time'] = usage_time
return sorted(buckets.values(), key=lambda x: x['amount'], reverse=True)
return sorted(buckets.values(), key=_usage_time_sort_key, reverse=True)
def _aggregate_items(items, group_by=None):