From ff3b192fd5090d32c25f6b6213ca655bb4491ca2 Mon Sep 17 00:00:00 2001 From: Derran Date: Mon, 1 Dec 2025 10:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AB=E7=91=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WalletAccountQueryServiceImpl.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java index 8ad439f..d517f80 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java @@ -95,29 +95,31 @@ public class WalletAccountQueryServiceImpl implements WalletAccountQueryService public BigDecimal countAvailableWithdrawBalance(WalletAccount walletAccount) { BigDecimal availableBalance = walletAccount.getAvailableBalance(); BigDecimal unavailableWithdrawBalance; - MatchmakerLevelEnum matchmakerLevel = matchmakerQueryService.queryLevelByUserId(walletAccount.getUserId()); - if (Objects.isNull(matchmakerLevel) || matchmakerLevel.getLevel() < MatchmakerLevelEnum.MATCHMAKER_PARTNER.getLevel()) { - //普通提现 月薪 - LocalDate date = LocalDate.now(); - int months = 0; - if (date.getDayOfMonth() < 15) { - //可结算上一个月 - months = 1; - } - //不可提现的金额 - unavailableWithdrawBalance = countUnavailableWithdrawBalanceByMonth(walletAccount.getId(), date, months); - } else { - // 高级红娘以上 周薪制 - LocalDate date = LocalDate.now(); - DayOfWeek dayOfWeek = date.getDayOfWeek(); - int days = dayOfWeek.getValue() - 1; - if (dayOfWeek.getValue() < DayOfWeek.WEDNESDAY.getValue()) { - //可结算上一个周 - days += DayOfWeek.SUNDAY.getValue(); - } - //不可提现的金额 - unavailableWithdrawBalance = countUnavailableWithdrawBalanceByDays(walletAccount.getId(), date, days); - } +// MatchmakerLevelEnum matchmakerLevel = matchmakerQueryService.queryLevelByUserId(walletAccount.getUserId()); +// if (Objects.isNull(matchmakerLevel) || matchmakerLevel.getLevel() < MatchmakerLevelEnum.MATCHMAKER_PARTNER.getLevel()) { +// //普通提现 月薪 +// LocalDate date = LocalDate.now(); +// int months = 0; +// if (date.getDayOfMonth() < 15) { +// //可结算上一个月 +// months = 1; +// } +// //不可提现的金额 +// unavailableWithdrawBalance = countUnavailableWithdrawBalanceByMonth(walletAccount.getId(), date, months); +// } else { +// // 高级红娘以上 周薪制 +// LocalDate date = LocalDate.now(); +// DayOfWeek dayOfWeek = date.getDayOfWeek(); +// int days = dayOfWeek.getValue() - 1; +// if (dayOfWeek.getValue() < DayOfWeek.WEDNESDAY.getValue()) { +// //可结算上一个周 +// days += DayOfWeek.SUNDAY.getValue(); +// } +// //不可提现的金额 +// unavailableWithdrawBalance = countUnavailableWithdrawBalanceByDays(walletAccount.getId(), date, days); +// } + LocalDate date = LocalDate.now(); + unavailableWithdrawBalance = countUnavailableWithdrawBalanceByDays(walletAccount.getId(), date, 2); return availableBalance.compareTo(unavailableWithdrawBalance) > 0 ? availableBalance.subtract(unavailableWithdrawBalance) : BigDecimal.ZERO; }