From eeef63d31f05d894c8adbeb0242a8144e6de2b83 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 18 Nov 2025 10:43:41 +0800
Subject: [PATCH] 新增英镑汇率
---
trading-order-service/src/main/java/com/yami/trading/service/rate/UserRateConfigService.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/rate/UserRateConfigService.java b/trading-order-service/src/main/java/com/yami/trading/service/rate/UserRateConfigService.java
index ede2329..5e1ddb4 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/rate/UserRateConfigService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/rate/UserRateConfigService.java
@@ -13,6 +13,8 @@
import com.yami.trading.bean.rate.domain.UserRateConfig;
import com.yami.trading.dao.rate.UserRateConfigMapper;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Objects;
/**
@@ -50,18 +52,17 @@
*/
public ExchangeRate findUserConfig(String partyId) {
- Syspara currency = sysparaService.find("rate_default_currency");
+ String currency = sysparaService.find("rate_default_currency").getSvalue();
String user_default_currency = "USD";
//如果配置了默认币种类型，返回配置的币种类型，默认是USD
- if(Objects.nonNull(currency)) {
- user_default_currency = currency.getSvalue().toUpperCase();
+ if(!currency.isEmpty()) {
+ user_default_currency = currency;
}
+ ExchangeRate exchangeRate = exchangeRateService.findBy(ExchangeRate.IN, user_default_currency);
- ExchangeRate exchangeRate ;
-
- if (StringUtils.isNullOrEmpty(partyId)) {
+ /*if (StringUtils.isNullOrEmpty(partyId)) {
exchangeRate = exchangeRateService.findBy(ExchangeRate.IN, user_default_currency);
} else {
UserRateConfig userRateConfig = getByPartyId(partyId);
@@ -70,10 +71,26 @@
} else {
exchangeRate = exchangeRateService.findBy(ExchangeRate.IN, userRateConfig.getCurrency());
}
- }
+ }*/
return exchangeRate;
}
+ /**
+ * 查询用户计价方式，欧元和英镑
+ */
+ public List<ExchangeRate> findUserConfigList(String partyId) {
+ ExchangeRate exchangeRate1 = exchangeRateService.findBy(ExchangeRate.IN, "EUR");
+ ExchangeRate exchangeRate2 = exchangeRateService.findBy(ExchangeRate.IN, "GBP");
+ if (exchangeRate1 == null && exchangeRate2 == null) {
+ return null;
+ }
+ List<ExchangeRate> exchangeRates = new ArrayList<>();
+ exchangeRates.add(exchangeRate1);
+ exchangeRates.add(exchangeRate2);
+
+ return exchangeRates;
+ }
+
public UserRateConfig getByPartyId(String partyId) {
return getOne(Wrappers.<UserRateConfig>query().lambda().eq(UserRateConfig::getPartyId, partyId));
}
--
Gitblit v1.9.3