From 6d6721fb0a40d4caa71273246fbe65b29dc632e5 Mon Sep 17 00:00:00 2001 From: vladp Date: Fri, 27 Mar 2026 21:54:36 +0700 Subject: [PATCH] dev add reason entity --- referral/src/main/kotlin/Referral.kt | 1 + referral/src/main/kotlin/ReferralService.kt | 4 +++- referral/src/main/kotlin/ReferralStat.kt | 1 + .../soune/nocopy/service/referral/ReferralRepoImpl.java | 8 ++++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/referral/src/main/kotlin/Referral.kt b/referral/src/main/kotlin/Referral.kt index 4b65d8a..cb0e89f 100644 --- a/referral/src/main/kotlin/Referral.kt +++ b/referral/src/main/kotlin/Referral.kt @@ -9,5 +9,6 @@ interface Referral { val totalIncome: Int val availableIncome: Int val holdBalance: Int + val spentBalance: Int val active: Boolean } \ No newline at end of file diff --git a/referral/src/main/kotlin/ReferralService.kt b/referral/src/main/kotlin/ReferralService.kt index 489e149..d36534e 100644 --- a/referral/src/main/kotlin/ReferralService.kt +++ b/referral/src/main/kotlin/ReferralService.kt @@ -18,6 +18,7 @@ class ReferralService( override val totalIncome = 0 override val availableIncome = 0 override val holdBalance: Int = 0 + override val spentBalance: Int = 0 override val active: Boolean = false } @@ -59,7 +60,8 @@ class ReferralService( totalIncome = referral.totalIncome, availableIncome = referral.availableIncome, holdBalance = referral.holdBalance, - referralLink = referral.referralLink + referralLink = referral.referralLink, + spentBalance = referral.spentBalance, ) } diff --git a/referral/src/main/kotlin/ReferralStat.kt b/referral/src/main/kotlin/ReferralStat.kt index d9e6ae5..fa05122 100644 --- a/referral/src/main/kotlin/ReferralStat.kt +++ b/referral/src/main/kotlin/ReferralStat.kt @@ -7,4 +7,5 @@ data class ReferralStat( val availableIncome: Int, val holdBalance: Int, val referralLink: String, + val spentBalance: Int, ) \ No newline at end of file diff --git a/src/main/java/ru/soune/nocopy/service/referral/ReferralRepoImpl.java b/src/main/java/ru/soune/nocopy/service/referral/ReferralRepoImpl.java index c210ed3..b02d0b4 100644 --- a/src/main/java/ru/soune/nocopy/service/referral/ReferralRepoImpl.java +++ b/src/main/java/ru/soune/nocopy/service/referral/ReferralRepoImpl.java @@ -99,8 +99,7 @@ public class ReferralRepoImpl implements ReferralRepo { @Override public int getAvailableIncome() { - Integer holdBalance = entity.getHoldBalance(); - return entity.getTotalIncome() - (holdBalance != null ? holdBalance : 0); + return entity.getAvailableIncome(); } @Override @@ -109,6 +108,11 @@ public class ReferralRepoImpl implements ReferralRepo { return holdBalance != null ? holdBalance : 0; } + @Override + public int getSpentBalance() { + return entity.getTotalIncome() - entity.getAvailableIncome() - entity.getHoldBalance(); + } + @Override public boolean getActive() { return entity.isActive(); } };