Merge remote-tracking branch 'origin/main' into codex/deepseek-assistant-fix

finance/views.py

@@ -7,6 +7,7 @@ import math
 import tempfile
 import uuid
 from datetime import timedelta
+from decimal import Decimal
 from functools import wraps
 from pathlib import Path
 
@@ -15,6 +16,7 @@ from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.models import User
 from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
+from django.core.serializers.json import DjangoJSONEncoder
 from django.db import IntegrityError, connection, transaction
 from django.http import FileResponse, HttpResponse, JsonResponse
 from django.middleware.csrf import get_token
@@ -299,7 +301,7 @@ def query(request, dataset_id):
     ds = dataset(request, dataset_id, True)
     pref, _ = preferences(request, ds)
     limit(f"analysis:{request.user.pk}", 120, 60)
-    return JsonResponse(analyze(ds, request.member, body(request), pref))
+    return JsonResponse(analyze(ds, request.member, body(request), pref), encoder=AmountJSONEncoder)
 
 
 def amount_text(value):
@@ -310,6 +312,19 @@ def amount_text(value):
     return "0" if text == "-0" else text
 
 
+class AmountJSONEncoder(DjangoJSONEncoder):
+    """分析接口的 Decimal 统一经 amount_text 输出。
+
+    PostgreSQL 把 NUMERIC(44,24) 原样读回，DjangoJSONEncoder 默认 str() 会把
+    存储尺度尾零直接暴露给前端；SQLite 无此尺度，两库表现需一致。
+    """
+
+    def default(self, o):
+        if isinstance(o, Decimal):
+            return amount_text(o)
+        return super().default(o)
+
+
 @endpoint(("POST",))
 def evidence(request, dataset_id):
     ds = dataset(request, dataset_id, True)