From b865e7f64ad0a1edf9b795c0e66a1ba13b0d6aca Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 06 Sep 2025 14:20:40 +0800
Subject: [PATCH] BUG
---
trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java b/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
index 577f5c6..5b45e3a 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
@@ -21,6 +21,7 @@
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.dao.item.ItemMapper;
import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +49,6 @@
private ItemLeverageService itemLeverageService;
private Map<String, Integer> symbolDecimal = Maps.newHashMap();
-
@Autowired
private CacheManager cacheManager;
@@ -119,12 +119,27 @@
public Item findBySymbol(String symbol) {
List<Item> items = ApplicationContextUtils.getApplicationContext().getBean(ItemService.class).list();
if (CollectionUtil.isNotEmpty(items)) {
- Optional<Item> first = items.stream().filter(i -> symbol.equalsIgnoreCase(i.getSymbol())).findFirst();
+ Optional<Item> first = items.stream()
+ .filter(i -> {
+ String compareField = symbol.indexOf("usdt") > 0
+ ? i.getSymbol()
+ : i.getSymbolData();
+ return symbol.equalsIgnoreCase(compareField);
+ })
+ .findFirst();
return first.orElse(null);
}
- LambdaQueryWrapper<Item> queryWrapper = new LambdaQueryWrapper<Item>()
- .eq(Item::getSymbol, symbol)
- .last("LIMIT 1");
+ LambdaQueryWrapper<Item> queryWrapper = null;
+ if(symbol.indexOf("usdt") > 0){
+ queryWrapper = new LambdaQueryWrapper<Item>()
+ .eq(Item::getSymbol, symbol)
+ .last("LIMIT 1");
+ }else {
+ queryWrapper = new LambdaQueryWrapper<Item>()
+ .eq(Item::getSymbolData, symbol)
+ .last("LIMIT 1");
+ }
+
return super.baseMapper.selectOne(queryWrapper);
}
@@ -162,7 +177,7 @@
@Cached(name = ITEM_CACHE, key = "'all'", expire = 3600)
@Override
public List<Item> list() {
- List<Item> list = super.list();
+ List<Item> list = super.list(new LambdaQueryWrapper<>(Item.class).eq(Item::getType,Item.cryptos));
symbolDecimal = list.stream()
.collect(Collectors.toMap(Item::getSymbol, Item::getDecimals, (s1, s2) -> s2));
return list;
@@ -203,7 +218,7 @@
}
public List<Item> cacheGetAll() {
- return ApplicationContextUtils.getApplicationContext().getBean(ItemService.class).list();
+ return ApplicationContextUtils.getApplicationContext().getBean(ItemService.class).list(new LambdaQueryWrapper<>(Item.class).eq(Item::getType,Item.cryptos));
}
--
Gitblit v1.9.3