From 0b2d47ad50450876b3fd26db354e3021248da869 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 21 Sep 2025 19:53:40 +0800
Subject: [PATCH] 1
---
src/main/resources/application.properties | 2 +-
src/main/java/com/nq/controller/protol/UserController.java | 4 ++--
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 31 +++++++++++++++++++++++++------
src/main/java/com/nq/service/IUserPositionService.java | 2 +-
src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java | 9 ++++++---
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index db32f74..b0a11b2 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -168,9 +168,9 @@
//一键用户平仓操作
@RequestMapping({"allsell.do"})
@ResponseBody
- public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+ public ServerResponse allsell(HttpServletRequest request) {
try {
- return this.iUserPositionService.allSell(request,positionSn);
+ return this.iUserPositionService.allSell(request);
} catch (Exception e) {
return ServerResponse.createByErrorMsg("Sell Fail",request);
}
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index 34ddad4..7b574c7 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -18,7 +18,7 @@
ServerResponse sell(String paramString, int paramInt);
ServerResponse sell(String paramString, int paramInt,Integer number, HttpServletRequest request);
- ServerResponse allSell(HttpServletRequest request,String stockType)throws Exception;
+ ServerResponse allSell(HttpServletRequest request)throws Exception;
ServerResponse lock(Integer paramInteger1, Integer paramInteger2, String paramString);
diff --git a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
index 560caac..c981e1d 100644
--- a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
@@ -1,6 +1,7 @@
package com.nq.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nq.common.ServerResponse;
@@ -101,10 +102,12 @@
public ServerResponse getInfo(HttpServletRequest request) {
List<SiteInfo> siteInfos = this.siteInfoMapper.findAll();
-
+ SiteInfo siteInfo = (SiteInfo) siteInfos.get(0);
+ User user = iUserService.getCurrentRefreshUser(request);
+ if(ObjectUtil.isEmpty(user)){
+ return ServerResponse.createBySuccess(siteInfo);
+ }
if (siteInfos.size() > 0) {
- SiteInfo siteInfo = (SiteInfo) siteInfos.get(0);
- User user = iUserService.getCurrentRefreshUser(request);
log.info("当前以后名");
if(user != null ){
AgentUser agentUser = agentUserMapper.findAgentByAgentId(user.getAgentId());
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 4d8cda8..50a374e 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -448,20 +448,39 @@
return ServerResponse.createBySuccessMsg("平仓成功!", request);
}
- @Transactional
@Override
- public ServerResponse allSell(HttpServletRequest request, String stockType) throws Exception {
- //判断股票是否在可交易时间段
+ public ServerResponse allSell(HttpServletRequest request) throws Exception {
User user = iUserService.getCurrentUser(request);
QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", user.getId());
queryWrapper.isNull("sell_order_id");
List<UserPosition> userPositionList = userPositionMapper.selectList(queryWrapper);
- for (int i = 0; i < userPositionList.size(); i++) {
- sell(userPositionList.get(i).getPositionSn(), 0);
+
+ // 如果没有需要平仓的持仓
+ if (userPositionList.isEmpty()) {
+ return ServerResponse.createBySuccessMsg("没有需要平仓的持仓订单");
}
- return ServerResponse.createBySuccessMsg("平仓成功!");
+
+ // 收集所有提示信息
+ List<String> successMessages = new ArrayList<>();
+ List<String> errorMessages = new ArrayList<>();
+
+ for (UserPosition position : userPositionList) {
+ ServerResponse response = sell(position.getPositionSn(), 0, position.getOrderNum(), request);
+
+ if (response.getStatus() == 0) {
+ // 失败的情况
+ errorMessages.add("订单号：" + position.getPositionSn() + " 失败，原因：" + response.getMsg());
+ }
+ }
+
+ // 根据是否有错误返回不同的状态
+ if (!errorMessages.isEmpty()) {
+ return ServerResponse.createByErrorMsg(errorMessages.toString(), request);
+ } else {
+ return ServerResponse.createBySuccessMsg("平仓成功!", request);
+ }
}
//用户追加保证金操作
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f320d2f..f2ea58b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,7 +17,7 @@
ftp.user=ftp_stock
ftp.pass=123456
ftp.address =/www/wwwroot/ftp_stock/
-ftp.server.http.prefix=https://img.isusstock.com/
+ftp.server.http.prefix=https://img.huangzhongzhang.com/
redis1.ip=localhost
#redis1.port=6380
--
Gitblit v1.9.3