From c8b031a405ebd2b450f5098bb37e5e63390f364c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 09:57:31 +0800
Subject: [PATCH] 新增贷款，优化
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 9f3b275..45143b5 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -176,7 +176,7 @@
@Override
- public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
+ public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) throws Exception {
//UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
//查询墨西哥账户
UserAssets userAssets = assetsByTypeAndUserId(EStockType.MX.getCode(), userId);
@@ -188,6 +188,9 @@
if (exchangeRate != null) {
//转换为墨西哥币
amount = exchangeAmountByRate(amount, exchangeRate.getRata());
+ } else {
+ log.error("availablebalanceChange ExchangeRate is null:{}>>{}", stockType.getSymbol(), EStockType.MX.getSymbol());
+ throw new Exception("货币转换汇率未设置");
}
}
UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
@@ -310,7 +313,7 @@
}
- public Boolean aiAvailableBalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, BigDecimal buyAmount) {
+ public Boolean aiAvailableBalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount) throws Exception {
//查询墨西哥账户
UserAssets userAssets = assetsByTypeAndUserId(EStockType.MX.getCode(), userId);
//如果不是墨西哥币需要转换金额
@@ -321,9 +324,9 @@
if (exchangeRate != null) {
//转换为墨西哥币
amount = exchangeAmountByRate(amount, exchangeRate.getRata());
- buyAmount = exchangeAmountByRate(buyAmount, exchangeRate.getRata());
} else {
- return false;
+ log.error("ExchangeRate is null:{}>>{}", stockType.getSymbol(), EStockType.MX.getSymbol());
+ throw new Exception("货币转换汇率未设置");
}
}
String before = userAssets.getAvailableBalance().toString();
@@ -339,10 +342,23 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
} else if (eUserAssets.getCode().equals(EUserAssets.AI_SETTLEMENT.getCode())) {
//解除购买冻结金额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(buyAmount.negate()));
- //归还可用金额（购买金额+收益）
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+ //归还购买金额
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ } else if (eUserAssets.getCode().equals(EUserAssets.AI_SETTLEMENT_INT.getCode())) {
+ //收益
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ } else if(eUserAssets.getCode().equals(EUserAssets.DK.getCode())) {
+ //发放贷款金额
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ } else if(eUserAssets.getCode().equals(EUserAssets.RT_DK.getCode())) {
+ //归还贷款
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ } else if(eUserAssets.getCode().equals(EUserAssets.RT_DK_INT.getCode())) {
+ //贷款利息
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
}
+
String after = userAssets.getAvailableBalance().toString();
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
--
Gitblit v1.9.3