i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-08 10:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source 
# Conflicts:
#	apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/payloads.rs
#	apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/reads.rs
#	apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/update.rs
#	apps/aether-gateway/src/tests/control/admin/endpoints/routes.rs
#	frontend/src/features/models/components/GlobalModelFormDialog.vue
#	frontend/src/features/providers/components/ProviderModelFormDialog.vue
#	frontend/src/features/providers/components/provider-tabs/__tests__/model-test-request.spec.ts
#	frontend/src/features/providers/components/provider-tabs/model-test-request.ts
This commit is contained in:
ZheFox
2026-05-18 22:02:31 +08:00
parent 2de0cbbafc d51b44d642
commit 995ab302be
102 changed files with 14682 additions and 2875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/src/repository/settlement/postgres.rs
+14
View File
@@ -528,6 +528,20 @@ LIMIT 1
}
None => Some(0.0),
};
if let Some(row) = wallet_row.as_ref() {
let wallet_id: String = row.try_get("id").map_postgres_err()?;
let before_recharge: f64 = row.try_get("balance").map_postgres_err()?;
let before_gift: f64 =
row.try_get("gift_balance").map_postgres_err()?;
let before_total = before_recharge + before_gift;
settlement.wallet_id = Some(wallet_id);
settlement.wallet_balance_before = Some(before_total);
settlement.wallet_balance_after = Some(before_total);
settlement.wallet_recharge_balance_before = Some(before_recharge);
settlement.wallet_recharge_balance_after = Some(before_recharge);
settlement.wallet_gift_balance_before = Some(before_gift);
settlement.wallet_gift_balance_after = Some(before_gift);
}
let wallet_debit_cost_usd = if !api_key_is_standalone {
if let Some(user_id) =