From dfd95b8354429de9b14087cb96cba0ba0cd7265a Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 15 Jul 2025 14:07:06 +0800
Subject: [PATCH] 大宗交易修改
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 3e4ad25..9f3b275 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.nq.Repository.ExchangeRateRepository;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
import com.nq.enums.EStockType;
@@ -49,6 +50,10 @@
@Autowired
UserPositionMapper userPositionMapper;
+
+ @Autowired
+ ExchangeRateRepository exchangeRateRepository;
+
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
@@ -172,8 +177,19 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
-
- UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
+ //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());
+ }
+ }
UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
String type = eUserAssets.getDesc();
String before = userAssets.getAvailableBalance().toString();
@@ -294,7 +310,22 @@
}
- public Boolean aiAvailableBalanceChange(UserAssets userAssets, EUserAssets eUserAssets, BigDecimal amount, BigDecimal buyAmount) {
+ public Boolean aiAvailableBalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, BigDecimal buyAmount) {
+ //查询墨西哥账户
+ 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;
+ }
+ }
String before = userAssets.getAvailableBalance().toString();
if (eUserAssets.getCode().equals(EUserAssets.BUY_AI.getCode())) {
//冻结金额
@@ -307,9 +338,9 @@
//归还可用金额
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
} else if (eUserAssets.getCode().equals(EUserAssets.AI_SETTLEMENT.getCode())) {
- //解除冻结金额
+ //解除购买冻结金额
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(buyAmount.negate()));
- //归还可用金额（买入金额+收益）
+ //归还可用金额（购买金额+收益）
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}
String after = userAssets.getAvailableBalance().toString();
--
Gitblit v1.9.3