fix: round website rates to two decimals

This commit is contained in:
SmartUp Developer
2026-06-30 11:26:48 +08:00
parent a914d3d222
commit 2d1dcb8f9f
6 changed files with 88 additions and 26 deletions
+11 -6
View File
@@ -11,9 +11,10 @@ from app.models.snapshot import UpstreamRateSnapshot
from app.models.upstream import Upstream
from app.models.upstream_key import UpstreamGeneratedKey
from app.models.website import Website, WebsiteGroupBinding, WebsiteSyncLog
from app.services.website_client import Sub2ApiWebsiteClient, WebsiteError, _extract_id, calculate_target_rate, decimal_string
from app.services.website_client import Sub2ApiWebsiteClient, WebsiteError, _extract_id, calculate_target_rate
from app.services.upstream_client import UpstreamClient
from app.services import webhook_service
from app.utils.number import fixed_decimal_string
logger = logging.getLogger(__name__)
@@ -91,8 +92,8 @@ def _log(
algorithm=binding.algorithm,
percent=binding.percent,
source_rates_json=json.dumps(source_rates, ensure_ascii=False),
old_rate=decimal_string(old_rate) if old_rate not in (None, "") else None,
new_rate=decimal_string(new_rate) if new_rate not in (None, "") else None,
old_rate=fixed_decimal_string(old_rate, 2) if old_rate not in (None, "") else None,
new_rate=fixed_decimal_string(new_rate, 2) if new_rate not in (None, "") else None,
status=status,
message=message,
)
@@ -147,7 +148,11 @@ def sync_binding(db: Session, binding: WebsiteGroupBinding, write: bool = True)
groups = client.get_groups(website.groups_endpoint)
target = next((item for item in groups if item.get("id") == binding.target_group_id), None)
old_rate = target.get("rate_multiplier") if target else None
client.update_group_rate(website.group_update_endpoint, binding.target_group_id, target_rate)
client.update_group_rate(
website.group_update_endpoint,
binding.target_group_id,
target_rate,
)
website.last_status = "healthy"
website.last_error = None
except Exception as exc:
@@ -157,8 +162,8 @@ def sync_binding(db: Session, binding: WebsiteGroupBinding, write: bool = True)
return _log(db, binding, website, source_rates, "failed", f"写回失败:{exc}", old_rate, target_rate)
db.commit()
log = _log(db, binding, website, source_rates, "success", "同步成功", old_rate, target_rate)
old_rate_str = decimal_string(old_rate) if old_rate not in (None, "") else None
new_rate_str = decimal_string(target_rate)
old_rate_str = fixed_decimal_string(old_rate, 2) if old_rate not in (None, "") else None
new_rate_str = fixed_decimal_string(target_rate, 2)
if old_rate_str != new_rate_str:
webhook_service.send_website_rate_changed(
db,