From f9ea0dcfb4bf3665caab910e0239d5048a3005fc Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 19 Sep 2025 10:37:36 +0800
Subject: [PATCH] 9.17
---
trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 30627f1..bf4589f 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
@@ -16,6 +16,7 @@
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.item.dto.ItemDTO;
import com.yami.trading.bean.item.dto.ItemLeverageDTO;
+import com.yami.trading.bean.robot.domain.Robot;
import com.yami.trading.common.util.ApplicationContextUtils;
import com.yami.trading.common.util.MarketOpenChecker;
import com.yami.trading.common.util.StringUtils;
@@ -41,8 +42,8 @@
@Transactional
@Slf4j
public class ItemService extends ServiceImpl<ItemMapper, Item> {
- public static final String ITEM_CACHE = "syItemCache";
- public static final String ALL = "syAll";
+ public static final String ITEM_CACHE = "mdItemCache";
+ public static final String ALL = "mdAll";
@Autowired
private ItemLeverageService itemLeverageService;
@@ -158,7 +159,7 @@
return baseMapper.findList(page, queryWrapper);
}
- @Cached(name = ITEM_CACHE, key = "'all'", expire = 3600)
+ @Cached(name = ITEM_CACHE, key = "'itemAll'", expire = 3600)
@Override
public List<Item> list() {
List<Item> list = super.list(new LambdaQueryWrapper<>(Item.class).eq(Item::getType,Item.cryptos));
@@ -180,7 +181,7 @@
}
// 清除 list() 方法的缓存（关键：与@Cached的name和key一致）
- /*@CacheEvict(cacheNames = ITEM_CACHE, key = "'all'")
+ /*@CacheEvict(cacheNames = ITEM_CACHE, key = "'itemAll'")
public void clearListCache() {
log.info("已清除 list() 方法的缓存");
}*/
@@ -252,7 +253,7 @@
* @return
*/
public boolean isContractTrading(Item item) {
- item = findBySymbol(item.getUuid());
+ item = findBySymbol(item.getSymbol());
//虚拟币新币才判断
if (item.getType().equals(Item.cryptos) && (item.getCurrencyType() != null && item.getCurrencyType() == 1)) {
if (item.getTradeType() != null && item.getTradeType().equals("0")) {
@@ -267,12 +268,15 @@
* @return
*/
public boolean isSuspended(String symbol) {
- Item item = findBySymbol(symbol);
- //虚拟币新币才判断
- if (item.getType().equals(Item.cryptos) /*&& (item.getCurrencyType() != null && item.getCurrencyType() == 1)*/) {
- //item = getById(item.getUuid());
- if (item.getStatus() != null && item.getStatus() == 0) {
- return true;
+ //Item item = findBySymbol(symbol);
+ Item item = getOne(new LambdaQueryWrapper<Item>().eq(Item::getSymbol, symbol));
+ if (item != null) {
+ //虚拟币新币才判断
+ if (item.getType().equals(Item.cryptos) /*&& (item.getCurrencyType() != null && item.getCurrencyType() == 1)*/) {
+ //item = getById(item.getUuid());
+ if (item.getStatus() != null && item.getStatus() == 0) {
+ return true;
+ }
}
}
return false;
--
Gitblit v1.9.3