From 54a5b503d811f7ca3f356728c3ab1e04451a9a86 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 20 Dec 2025 16:49:09 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java | 2 +-
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 16 +++++++++++-----
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
index ae8de2d..9918909 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java
@@ -56,7 +56,7 @@
newsSerivce.pageNews(page,request.getTitle(),request.getLanguage(),request.getUserCode());
for (NewsDto news:page.getRecords()){
news.setLanguageText(Constants.LANGUAGE.get(news.getLanguage()));
- String nUrl = Constants.IMAGES_HTTP+news.getImgUrl();
+ String nUrl =/* Constants.IMAGES_HTTP+*/news.getImgUrl();
news.setHttpImgUrl(nUrl);
}
return Result.ok(page);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
index 250af78..927c88c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RestController
@@ -67,8 +68,8 @@
@RequestMapping(action + "list.action")
public Object list(HttpServletRequest request) {
List<News> list = new ArrayList<>();
- return list;
- /*String page_no = request.getParameter("page_no");
+ //return list;
+ String page_no = request.getParameter("page_no");
String language = request.getParameter("language");
if (StringUtils.isNullOrEmpty(page_no)) {
page_no = "1";
@@ -82,8 +83,13 @@
int page_no_int = Integer.valueOf(page_no).intValue();
Page<News> page = new Page<>(1, 1000000);
// List<News> list = this.newsService.cachePagedQuery(page_no_int, 20, language).getElements();
- LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda().eq(News::getLanguage, language)
- .eq(News::isPopUp,false);
+ // 1. 获取当前时间（对应SQL中的NOW()）
+ Date now = new Date();
+ LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda()
+ .eq(News::getLanguage, language)
+ .eq(News::isPopUp,false)
+ .le(News::getStartTime, now)
+ .ge(News::getEndTime, now);
lambdaQueryWrapper.orderByDesc(News::getCreateTime);
newsService.page(page, lambdaQueryWrapper);
list = page.getRecords();
@@ -108,7 +114,7 @@
}
}
- return Result.succeed(list);*/
+ return Result.succeed(list);
}
/**
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
index 377701a..4b260a5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
@@ -542,7 +542,7 @@
map.put("lastloginip", party.getUserLastip());
map.put("creditScore", party.getCreditScore());
// 实名认证通过返回真实姓名
- if (party.isRealNameAuthority()) {
+ if (party.isRealNameAuthority() && kyc != null) {
map.put("name", kyc.getName());
}
if (null != kyc) {
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
index 2305d95..33eeaa9 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
@@ -184,7 +184,7 @@
}
Kline kline = list.get(0);
BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
- if (currentValue != null && currentValue.compareTo(BigDecimal.ZERO) > 0) {
+ if (currentValue != null && currentValue.compareTo(BigDecimal.ZERO) != 0) {
if (!kline.isAdjusted()){
kline.setClose(kline.getClose().add(currentValue));
kline.setOpen(kline.getOpen().add(currentValue));
--
Gitblit v1.9.3