From 539f733f62f4a368eb90a07a729b5d948378a705 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 19 Jul 2025 18:29:07 +0800
Subject: [PATCH] 后台新增建仓列表 新股列表新增购买状态
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 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..174721b 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -176,19 +176,13 @@
@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);
//如果不是墨西哥币需要转换金额
if (!accetType.equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(accetType);
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
- stockType.getSymbol(), EStockType.MX.getSymbol()).orElse(null);
- if (exchangeRate != null) {
- //转换为墨西哥币
- amount = exchangeAmountByRate(amount, exchangeRate.getRata());
- }
+ amount = exchangeAmountByRate(accetType, amount);
}
UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
String type = eUserAssets.getDesc();
@@ -310,21 +304,12 @@
}
- 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);
//如果不是墨西哥币需要转换金额
if (!accetType.equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(accetType);
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
- stockType.getSymbol(), EStockType.MX.getSymbol()).orElse(null);
- if (exchangeRate != null) {
- //转换为墨西哥币
- amount = exchangeAmountByRate(amount, exchangeRate.getRata());
- buyAmount = exchangeAmountByRate(buyAmount, exchangeRate.getRata());
- } else {
- return false;
- }
+ amount = exchangeAmountByRate(accetType, amount);
}
String before = userAssets.getAvailableBalance().toString();
if (eUserAssets.getCode().equals(EUserAssets.BUY_AI.getCode())) {
@@ -339,10 +324,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());
@@ -351,7 +349,7 @@
moneyLog.setAmount(amount.toString());
moneyLog.setAccectType(userAssets.getAccectType());
moneyLog.setType(eUserAssets.getCode());
- moneyLog.setUserId(userAssets.getId()+"");
+ moneyLog.setUserId(userAssets.getUserId()+"");
moneyLog.setSymbol(EStockType.getEStockTypeByCode(userAssets.getAccectType()).getSymbol());
moneyLog.setCreateTime(new Date());
moneyLogMapper.insert(moneyLog);
@@ -359,8 +357,18 @@
}
@Override
- public BigDecimal exchangeAmountByRate(BigDecimal amount, BigDecimal rate) {
- //保留5位小数
- return amount.multiply(rate).setScale(5, RoundingMode.HALF_UP);
+ public BigDecimal exchangeAmountByRate(String accetType, BigDecimal amount) throws Exception {
+ EStockType stockType = EStockType.getEStockTypeByCode(accetType);
+ ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
+ stockType.getSymbol(), EStockType.MX.getSymbol()).orElse(null);
+ if (exchangeRate != null) {
+ //转换为墨西哥币 保留5位小数
+ return amount.multiply(exchangeRate.getRata()).setScale(5, RoundingMode.HALF_UP);
+ } else {
+ log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.MX.getSymbol());
+ throw new Exception("货币转换汇率未设置");
+ }
+
+
}
}
--
Gitblit v1.9.3