From 59dfc42a6cce131e63a637fc7a5afc6b1bbd27ac Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 09 Aug 2025 17:11:58 +0800
Subject: [PATCH] 类型筛选
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 207fe27..88dbd31 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -52,11 +52,8 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
- /*if(accetType.equals("SZHB")){
- accetType = "US";
- }*/
- if(accetType.equals(EStockType.US.getCode()) || accetType.equals("IN")){
- accetType = EStockType.MX.getCode();
+ if(!accetType.equals(EStockType.US.getCode())){
+ accetType = EStockType.US.getCode();
}
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
@@ -172,17 +169,17 @@
@Override
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())) {
+ //查询账户
+ UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ //是否需要转换金额
+ if (!accetType.equals(EStockType.getDefault().getCode())) {
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();
String before = userAssets.getAvailableBalance().toString();
- String accectType = userAssets.getAccectType();
+ accetType = userAssets.getAccectType();
BigDecimal amountLog = amount;
if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
@@ -268,7 +265,7 @@
moneyLog.setBeFore(before);
moneyLog.setAfter(after);
moneyLog.setAmount(amountLog.toString());
- moneyLog.setAccectType(accectType);
+ moneyLog.setAccectType(accetType);
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userId+"");
moneyLog.setSymbol(EStockType.getEStockTypeByCode(accetType).getSymbol());
@@ -309,10 +306,10 @@
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())) {
+ //查询账户
+ UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ //是否需要转换金额
+ if (!accetType.equals(EStockType.getDefault().getCode())) {
amount = exchangeAmountByRate(accetType, amount);
}
String before = userAssets.getAvailableBalance().toString();
@@ -368,12 +365,12 @@
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);
+ stockType.getSymbol(), EStockType.getDefault().getSymbol()).orElse(null);
if (exchangeRate != null) {
- //转换为墨西哥币 保留5位小数
+ //转换为默认货币 保留5位小数
return amount.multiply(exchangeRate.getRata()).setScale(5, RoundingMode.HALF_UP);
} else {
- log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.MX.getSymbol());
+ log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.getDefault().getSymbol());
throw new Exception("货币转换汇率未设置");
}
--
Gitblit v1.9.3