From f25b39e0d5fcae415a8824fc03d42fe681e96bf8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 21 Jul 2025 17:17:48 +0800
Subject: [PATCH] 移除多余引用
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 71 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 32 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..28f0c79 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -2,7 +2,6 @@
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.*;
@@ -16,7 +15,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.validation.constraints.Email;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
@@ -38,9 +36,6 @@
@Autowired
UserRechargeServiceImpl userRechargeService;
-
- @Autowired
- UserWithdrawServiceImpl withdrawService;
@Resource
UserRechargeMapper userRechargeMapper;
@@ -176,19 +171,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,40 +299,48 @@
}
- 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())) {
//冻结金额
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
//扣除可用金额
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(amount));
+ amount = amount.negate();
} else if (eUserAssets.getCode().equals(EUserAssets.BUY_AI_REJECT.getCode())) {
//解除冻结金额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
//归还可用金额
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().subtract(amount));
+ //归还购买金额
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().subtract(amount));
+ amount = amount.negate();
+ } else if(eUserAssets.getCode().equals(EUserAssets.RT_DK_INT.getCode())) {
+ //贷款利息
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(amount));
+ amount = amount.negate();
}
+
String after = userAssets.getAvailableBalance().toString();
+ //资金明细
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
@@ -351,7 +348,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 +356,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