From 5a766206055d0268e051e44d9b8b39d411142426 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 16 Jul 2025 15:58:05 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nq/common/ServerResponse.java | 10 ++++------
src/main/java/com/nq/controller/backend/AdminStockAiController.java | 3 +--
src/main/java/com/nq/utils/redis/RedisShardedPoolUtils.java | 2 +-
src/main/java/com/nq/service/impl/StockServiceImpl.java | 13 ++++++++++---
src/main/java/com/nq/pojo/User.java | 1 +
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 7 ++++---
src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java | 2 +-
src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java | 5 +++--
src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java | 4 ++--
9 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nq/common/ServerResponse.java b/src/main/java/com/nq/common/ServerResponse.java
index c31a467..670fcd7 100644
--- a/src/main/java/com/nq/common/ServerResponse.java
+++ b/src/main/java/com/nq/common/ServerResponse.java
@@ -74,8 +74,7 @@
public static <T> ServerResponse<T> createBySuccessMsg(String msg,HttpServletRequest request) {
- //return new ServerResponse(ResponseCode.SUCCESS.getCode(), new GoogleTranslateUtil().translate(msg,request.getHeader(LANG)));
- return new ServerResponse(ResponseCode.SUCCESS.getCode(), msg);
+ return new ServerResponse(ResponseCode.SUCCESS.getCode(), new GoogleTranslateUtil().translate(msg,request.getHeader(LANG)));
}
public static <T> ServerResponse<T> createBySuccess(T data) {
@@ -84,8 +83,7 @@
public static <T> ServerResponse<T> createBySuccess(String data,HttpServletRequest request) {
- //return new ServerResponse(ResponseCode.SUCCESS.getCode(), new GoogleTranslateUtil().translate(data,request.getHeader(LANG)));
- return new ServerResponse(ResponseCode.SUCCESS.getCode(), data);
+ return new ServerResponse(ResponseCode.SUCCESS.getCode(), new GoogleTranslateUtil().translate(data,request.getHeader(LANG)));
}
public static <T> ServerResponse<T> createBySuccess(String msg, T data) {
@@ -105,8 +103,8 @@
return new ServerResponse(ResponseCode.ERROR.getCode(), errormsg);
}
public static <T> ServerResponse<T> createByErrorMsg(String errormsg, HttpServletRequest request) {
- //return new ServerResponse(ResponseCode.ERROR.getCode(), new GoogleTranslateUtil().translate(errormsg,request.getHeader(LANG)));
- return new ServerResponse(ResponseCode.ERROR.getCode(), errormsg);
+ return new ServerResponse(ResponseCode.ERROR.getCode(), new GoogleTranslateUtil().translate(errormsg,request.getHeader(LANG)));
+ //return new ServerResponse(ResponseCode.ERROR.getCode(), errormsg);
}
diff --git a/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java b/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
index bac006e..d6a56ee 100644
--- a/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
+++ b/src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java
@@ -6,6 +6,7 @@
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.nq.annotation.SameUrlData;
+import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
import com.nq.pojo.User;
import com.nq.utils.PropertiesUtil;
@@ -85,8 +86,7 @@
httpServletResponse.setCharacterEncoding("UTF-8");
httpServletResponse.setContentType("application/json;charset=UTF-8");
PrintWriter writer = httpServletResponse.getWriter();
- //writer.print( new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang ))));
- writer.print( new Gson().toJson(ServerResponse.createByErrorCodeMsg(401,"请登录")));
+ writer.print( new Gson().toJson(ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(), googleTranslateUtil.translate("请登录",lang ))));
writer.flush();
writer.close();
return false;
diff --git a/src/main/java/com/nq/controller/backend/AdminStockAiController.java b/src/main/java/com/nq/controller/backend/AdminStockAiController.java
index 2727af8..476ae19 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockAiController.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockAiController.java
@@ -2,7 +2,6 @@
import com.nq.common.ServerResponse;
import com.nq.pojo.StockAI;
- import com.nq.pojo.StockAIOrder;
import com.nq.pojo.StockAIOrderPosition;
import com.nq.service.IStockAiService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +39,7 @@
}
/**
- * 获取ai交易产品列表
+ * 获取ai交易产品订单列表
* @return
*/
@RequestMapping("getStockAiOrderList.do")
diff --git a/src/main/java/com/nq/pojo/User.java b/src/main/java/com/nq/pojo/User.java
index aebaf48..3de352d 100644
--- a/src/main/java/com/nq/pojo/User.java
+++ b/src/main/java/com/nq/pojo/User.java
@@ -30,6 +30,7 @@
private String img1Key;
private String img2Key;
private String img3Key;
+ //1.未实名 2.已实名 3.驳回
private Integer isActive;
private String authMsg;
private String withdrawalPwd;
diff --git a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
index 9155d70..3e13546 100644
--- a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
@@ -97,7 +97,7 @@
if (siteInfos.size() > 0) {
SiteInfo siteInfo = (SiteInfo) siteInfos.get(0);
User user = iUserService.getCurrentRefreshUser(request);
- log.info("当前以后名");
+ //log.info("当前以后名");
if(user != null ){
AgentUser agentUser = agentUserMapper.findAgentByAgentId(user.getAgentId());
if(agentUser != null){
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 89ec77a..e8e7785 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -758,10 +758,10 @@
public ServerResponse getIndicesList(String stockType) {
try {
String codeList;
- if (stockType.equals(EStockType.US.getCode())) {
- codeList = PropertiesUtil.getProperty("us_home_indices_code");
- } else {
+ if(stockType.equals(EStockType.MX.getCode()) || stockType.equals("MX")) {
codeList = PropertiesUtil.getProperty("mx_home_indices_code");
+ } else {
+ codeList = PropertiesUtil.getProperty("us_home_indices_code");
}
List<String> stockCodeList = Arrays.asList(codeList.split(","));
@@ -785,9 +785,16 @@
@Override
public ServerResponse getIndicesAndKData(String pid, String stockType) {
try {
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", pid));
+ if (stock == null) {
+ return ServerResponse.createByErrorMsg("无股票信息");
+ }
+ stockType = stock.getStockType();
Map<String, Object> resultMap = new HashMap<>();
DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, pid);
if (cacheBaseStock != null) {
+ resultMap.put("id", cacheBaseStock.getId());
+ resultMap.put("stockType", stockType);
resultMap.put("name", cacheBaseStock.getName());
resultMap.put("last", cacheBaseStock.getLast());
resultMap.put("chg", cacheBaseStock.getChg());
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 71b5756..4019b0d 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -357,10 +357,11 @@
if(null == stock){
return ServerResponse.createByErrorMsg("股票不存在，平仓失败", request);
}
- UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+ /*UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, userPosition.getUserId())
.eq(UserAssets::getAccectType, stock.getStockType())
- );
+ );*/
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(), userPosition.getUserId());
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
@@ -2072,7 +2073,7 @@
map.put("usPositionEarnings", String.valueOf(usPositionEarnings)); //美股持仓收益
map.put("usPositionEarningsParent", usPositionEarningsParent + "%");//美股持仓收益率
- map.put("mxMarketValue", String.valueOf(usPositionEarnings)); //墨西哥股市值
+ map.put("mxMarketValue", String.valueOf(mxMarketValue)); //墨西哥股市值
map.put("mxPositionEarnings", String.valueOf(mxPositionEarnings)); //墨西哥持仓收益
map.put("mxPositionEarningsParent", mxPositionEarningsParent + "%");//墨西哥持仓收益率
return ServerResponse.createBySuccess(map);
diff --git a/src/main/java/com/nq/utils/redis/RedisShardedPoolUtils.java b/src/main/java/com/nq/utils/redis/RedisShardedPoolUtils.java
index 5971891..b4ca767 100644
--- a/src/main/java/com/nq/utils/redis/RedisShardedPoolUtils.java
+++ b/src/main/java/com/nq/utils/redis/RedisShardedPoolUtils.java
@@ -142,7 +142,7 @@
try {
- if (key == null) {
+ if (key != null) {
jedis = RedisShardedPool.getJedis();
result = jedis.del(key);
diff --git a/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java b/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
index a9728d9..89f3c68 100644
--- a/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
+++ b/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
@@ -75,7 +75,8 @@
*/
public String translate(String content,String lang) {
- StringBuilder result = new StringBuilder();
+ return content;
+ /*StringBuilder result = new StringBuilder();
if (content.length() > 1000) {
int size = content.length() /1000 ;
for (int i = 0; i < size; i++) {
@@ -104,7 +105,7 @@
}
}
- return result.toString();
+ return result.toString();*/
}
public static void main(String[] args) throws Exception {
--
Gitblit v1.9.3