From 854aa5b79d3906b335524f09581f3a567a7bad49 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 30 Oct 2025 18:23:34 +0800
Subject: [PATCH] 周收益、代理后台入金 充值
---
src/main/java/com/nq/controller/agent/AgentController.java | 13 +
src/main/java/com/nq/ws/WebsocketRunClient.java | 262 ++++++++++++++++----------------
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 94 +++++-----
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 3
src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java | 22 +-
src/main/java/com/nq/service/impl/UserServiceImpl.java | 37 ++++
6 files changed, 236 insertions(+), 195 deletions(-)
diff --git a/src/main/java/com/nq/controller/agent/AgentController.java b/src/main/java/com/nq/controller/agent/AgentController.java
index 08d4230..0d09098 100644
--- a/src/main/java/com/nq/controller/agent/AgentController.java
+++ b/src/main/java/com/nq/controller/agent/AgentController.java
@@ -34,6 +34,8 @@
@Autowired
ISiteAdminService iSiteAdminService;
+ @Autowired
+ IUserAssetsServices iUserAssetsServices;
//查询指定代理信息
@RequestMapping({"getAgentInfo.do"})
@@ -145,4 +147,15 @@
@RequestParam("userId") Integer id){
return iUserService.getMoney(id);
}
+
+ @RequestMapping("updateMoney.do")
+ @ResponseBody
+ public ServerResponse updateayChnnel(
+ @RequestParam("id") Integer id,
+ @RequestParam("amt") String amt,
+ @RequestParam("type") String type
+
+ ){
+ return iUserAssetsServices.updateUserAssets(id,amt,type);
+ }
}
diff --git a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
index c981e1d..1547ebe 100644
--- a/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
@@ -114,21 +114,21 @@
if(agentUser != null){
siteInfo.setAgentCode(agentUser.getAgentCode());
if(!agentUser.getOnLineServices().isEmpty()){
-// siteInfo.setOnlineService(agentUser.getOnLineServices());
+ siteInfo.setOnlineService(agentUser.getOnLineServices());
}
}
}
- ObjectMapper objectMapper = new ObjectMapper();
- Map<String, String> metadataMap = new HashMap<>();
- metadataMap.put("name", StringUtils.isNotEmpty(user.getNickName()) ? user.getNickName() : "");
- String url = null;
- try {
- url = siteInfo.getOnlineService() + "&metadata=" + objectMapper.writeValueAsString(metadataMap);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- siteInfo.setOnlineService(url);
+// ObjectMapper objectMapper = new ObjectMapper();
+// Map<String, String> metadataMap = new HashMap<>();
+// metadataMap.put("name", StringUtils.isNotEmpty(user.getNickName()) ? user.getNickName() : "");
+// String url = null;
+// try {
+// url = siteInfo.getOnlineService() + "&metadata=" + objectMapper.writeValueAsString(metadataMap);
+// } catch (JsonProcessingException e) {
+// throw new RuntimeException(e);
+// }
+// siteInfo.setOnlineService(url);
return ServerResponse.createBySuccess(siteInfo);
}
return ServerResponse.createByErrorMsg("设置信息info不存在");
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 319e0f6..cd9d0dc 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -35,6 +35,7 @@
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -221,7 +222,7 @@
userPendingorder.setTargetPrice(preMarketPrice);
userPendingorder.setAddTime(new Date());
userPendingorder.setStatus(0);
- userPendingorder.setBuyAmt(buyAmt);
+ userPendingorder.setBuyAmt(preMarketPrice.multiply(new BigDecimal(buyNum)).setScale(2, RoundingMode.HALF_UP));
int ret = userPendingorderMapper.insert(userPendingorder);
}else {
userPosition.setPositionType(user.getAccountType());
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index ec3756f..0693d2d 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -42,8 +42,7 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -1200,17 +1199,45 @@
return ServerResponse.createBySuccess(BigDecimal.ZERO);
}
// 计算7天前的时间
- Date sevenDaysAgo = Date.from(LocalDateTime.now().minusDays(7).atZone(ZoneId.systemDefault()).toInstant());
+// Date sevenDaysAgo = Date.from(LocalDateTime.now().minusDays(7).atZone(ZoneId.systemDefault()).toInstant());
+//
+// List<UserPosition> userPositions = userPositionMapper.selectList(
+// new QueryWrapper<UserPosition>()
+// .eq("user_id", userId)
+// .and(wrapper -> wrapper
+// .isNotNull("sell_order_id")
+// .ge("sell_order_time", sevenDaysAgo)
+// .or()
+// .isNull("sell_order_id")
+// .ge("buy_order_time", sevenDaysAgo)
+// )
+// );
+ // 获取当前日期
+ LocalDate today = LocalDate.now();
+ // 获取当前周的周一和周日
+ LocalDate startOfWeek = today.with(DayOfWeek.MONDAY); // 本周周一
+ LocalDate endOfWeek = today.with(DayOfWeek.SUNDAY); // 本周周日
+
+ // 获取当前周周一和周日的开始时间和结束时间
+ LocalDateTime startOfWeekTime = startOfWeek.atStartOfDay(); // 周一 00:00:00
+ LocalDateTime endOfWeekTime = endOfWeek.atTime(LocalTime.MAX); // 周日 23:59:59.999999999
+
+ // 转换为Date类型
+ Date startOfWeekDate = Date.from(startOfWeekTime.atZone(ZoneId.systemDefault()).toInstant());
+ Date endOfWeekDate = Date.from(endOfWeekTime.atZone(ZoneId.systemDefault()).toInstant());
+ // 执行查询
List<UserPosition> userPositions = userPositionMapper.selectList(
new QueryWrapper<UserPosition>()
.eq("user_id", userId)
.and(wrapper -> wrapper
.isNotNull("sell_order_id")
- .ge("sell_order_time", sevenDaysAgo)
+ .ge("sell_order_time", startOfWeekDate) // 过滤sell_order_time >= 本周周一
+ .le("sell_order_time", endOfWeekDate) // 过滤sell_order_time <= 本周周日
.or()
.isNull("sell_order_id")
- .ge("buy_order_time", sevenDaysAgo)
+ .ge("buy_order_time", startOfWeekDate) // 过滤buy_order_time >= 本周周一
+ .le("buy_order_time", endOfWeekDate) // 过滤buy_order_time <= 本周周日
)
);
BigDecimal weeklyProfit = BigDecimal.ZERO;
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index e442949..a780d84 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,47 +1,47 @@
-package com.nq.ws;
-
-
-import com.nq.enums.EStockType;
-import com.nq.utils.PropertiesUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.java_websocket.client.WebSocketClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Configuration
-public class WebSocketClientBeanConfig {
-
-
- @Bean
- public Map<String, WebSocketClient> websocketRunClientMap() {
-
- Map<String, WebSocketClient> retMap = new HashMap<>(2);
- try {
- WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("US_WS_URL")),EStockType.US);
- websocketRunClient.connect();
- websocketRunClient.setConnectionLostTimeout(0);
- new Thread(() -> {
- while (true) {
- try {
- websocketRunClient.send("heartbeat".getBytes());
- } catch (Exception e) {
- websocketRunClient.reconnect();
- websocketRunClient.setConnectionLostTimeout(0);
- }
- }
- }).start();
- } catch (Exception e) {
- }
-
-
-
- return retMap;
- }
-
-
-}
+//package com.nq.ws;
+//
+//
+//import com.nq.enums.EStockType;
+//import com.nq.utils.PropertiesUtil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.java_websocket.client.WebSocketClient;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import java.net.URI;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Slf4j
+//@Configuration
+//public class WebSocketClientBeanConfig {
+//
+//
+// @Bean
+// public Map<String, WebSocketClient> websocketRunClientMap() {
+//
+// Map<String, WebSocketClient> retMap = new HashMap<>(2);
+// try {
+// WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI(PropertiesUtil.getProperty("US_WS_URL")),EStockType.US);
+// websocketRunClient.connect();
+// websocketRunClient.setConnectionLostTimeout(0);
+// new Thread(() -> {
+// while (true) {
+// try {
+// websocketRunClient.send("heartbeat".getBytes());
+// } catch (Exception e) {
+// websocketRunClient.reconnect();
+// websocketRunClient.setConnectionLostTimeout(0);
+// }
+// }
+// }).start();
+// } catch (Exception e) {
+// }
+//
+//
+//
+// return retMap;
+// }
+//
+//
+//}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index de2ff0e..4cae29d 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -1,131 +1,131 @@
-package com.nq.ws;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.nq.enums.EStockType;
-import com.nq.pojo.StockRealTimeBean;
-import com.nq.service.IMandatoryLiquidationService;
-import com.nq.service.impl.MandatoryLiquidationService;
-import com.nq.utils.ApplicationContextRegisterUtil;
-import com.nq.utils.redis.RedisKeyUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.handshake.ServerHandshake;
-import org.springframework.context.ApplicationContext;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-@Slf4j
-public class WebsocketRunClient extends WebSocketClient {
-
- private EStockType eStockType;
- public WebsocketRunClient(URI serverUri,
- EStockType eStockType
- ) {
- super(serverUri);
- this.eStockType = eStockType;
- }
-
- private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
-
-
- private static HttpPost httpPost;
- static {
- httpPost = new HttpPost("http://127.0.0.1:8008/api/sendNotification"); // 初始化 HttpPost
- }
-
- @Override
- public void onOpen(ServerHandshake serverHandshake) {
- send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
- Timer heartbeatTimer;
- // 启动心跳定时器
- heartbeatTimer = new Timer();
- heartbeatTimer.schedule(new TimerTask() {
- @Override
- public void run() {
- send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
- }
- }, 0, 3000); // 每3秒发送一次心跳消息
- }
-
- @Override
- public void onMessage(String s) {
- if(!s.equals("pong") && !s.equals("身份验证成功")){
- Map<String, String> stringObjectMap = jsonToMap(s);
- StockRealTimeBean stockRealTimeBean = new StockRealTimeBean();
- stockRealTimeBean.setPid(stringObjectMap.get("Id").toString());
- stockRealTimeBean.setLast(stringObjectMap.get("Last").toString());
- stockRealTimeBean.setBid(stringObjectMap.get("Bid").toString());
- stockRealTimeBean.setAsk(stringObjectMap.get("Ask").toString());
- stockRealTimeBean.setHigh(stringObjectMap.get("High").toString());
- stockRealTimeBean.setLow(stringObjectMap.get("Low").toString());
- stockRealTimeBean.setPc(stringObjectMap.get("Chg").toString());
- stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct").toString()+"%");
- stockRealTimeBean.setTime(stringObjectMap.get("Time").toString());
- RedisKeyUtil.setCacheRealTimeStock(EStockType.US,stockRealTimeBean);
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- if(!stockRealTimeBean.getPcp().contains("-")){
- stockRealTimeBean.setPcp("+"+stringObjectMap.get("ChgPct").toString()+"%");
- }
- String json = objectMapper.writeValueAsString(stockRealTimeBean);
- sendLoca(json);
- StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
- RedisKeyUtil.setCacheRealTimeStock(EStockType.US,stockDetailBean);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
-
- }else{
- log.error("websocket 消息错误："+s);
- }
- }
-
- public static Map<String, String> jsonToMap(String json) {
- Gson gson = new Gson();
- Type type = new TypeToken<Map<String, String>>(){}.getType();
- return gson.fromJson(json, type);
- }
-
- @Override
- public void onClose(int i, String s, boolean b) {
- log.info("websocket 印度股票 关闭"+1);
- }
-
- @Override
- public void onError(Exception e) {
- log.info("websocket 错误");
- }
-
- public void sendLoca(String message) {
- try {
- // 准备 form-data 参数
- List<BasicNameValuePair> params = new ArrayList<>();
- params.add(new BasicNameValuePair("message", message));
-
- // 设置编码格式为 UTF-8
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
- httpPost.setEntity(entity); // 设置 HttpPost 对象的参数
-
- // 发送请求
- HttpResponse response = httpClient.execute(httpPost);
-
- // 处理响应
- int statusCode = response.getStatusLine().getStatusCode();
- } catch (IOException e) {
- log.error("Http 请求错误", e);
- }
- }
-}
+//package com.nq.ws;
+//
+//import com.fasterxml.jackson.core.JsonProcessingException;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.google.gson.Gson;
+//import com.google.gson.reflect.TypeToken;
+//import com.nq.enums.EStockType;
+//import com.nq.pojo.StockRealTimeBean;
+//import com.nq.service.IMandatoryLiquidationService;
+//import com.nq.service.impl.MandatoryLiquidationService;
+//import com.nq.utils.ApplicationContextRegisterUtil;
+//import com.nq.utils.redis.RedisKeyUtil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.http.HttpResponse;
+//import org.apache.http.client.HttpClient;
+//import org.apache.http.client.entity.UrlEncodedFormEntity;
+//import org.apache.http.client.methods.HttpPost;
+//import org.apache.http.impl.client.HttpClients;
+//import org.apache.http.message.BasicNameValuePair;
+//import org.java_websocket.client.WebSocketClient;
+//import org.java_websocket.handshake.ServerHandshake;
+//import org.springframework.context.ApplicationContext;
+//
+//import java.io.IOException;
+//import java.lang.reflect.Type;
+//import java.net.URI;
+//import java.nio.charset.StandardCharsets;
+//import java.util.*;
+//
+//@Slf4j
+//public class WebsocketRunClient extends WebSocketClient {
+//
+// private EStockType eStockType;
+// public WebsocketRunClient(URI serverUri,
+// EStockType eStockType
+// ) {
+// super(serverUri);
+// this.eStockType = eStockType;
+// }
+//
+// private static HttpClient httpClient = HttpClients.createDefault(); // 单例化 HttpClient
+//
+//
+// private static HttpPost httpPost;
+// static {
+// httpPost = new HttpPost("http://127.0.0.1:8008/api/sendNotification"); // 初始化 HttpPost
+// }
+//
+// @Override
+// public void onOpen(ServerHandshake serverHandshake) {
+// send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+// Timer heartbeatTimer;
+// // 启动心跳定时器
+// heartbeatTimer = new Timer();
+// heartbeatTimer.schedule(new TimerTask() {
+// @Override
+// public void run() {
+// send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+// }
+// }, 0, 3000); // 每3秒发送一次心跳消息
+// }
+//
+// @Override
+// public void onMessage(String s) {
+// if(!s.equals("pong") && !s.equals("身份验证成功")){
+// Map<String, String> stringObjectMap = jsonToMap(s);
+// StockRealTimeBean stockRealTimeBean = new StockRealTimeBean();
+// stockRealTimeBean.setPid(stringObjectMap.get("Id").toString());
+// stockRealTimeBean.setLast(stringObjectMap.get("Last").toString());
+// stockRealTimeBean.setBid(stringObjectMap.get("Bid").toString());
+// stockRealTimeBean.setAsk(stringObjectMap.get("Ask").toString());
+// stockRealTimeBean.setHigh(stringObjectMap.get("High").toString());
+// stockRealTimeBean.setLow(stringObjectMap.get("Low").toString());
+// stockRealTimeBean.setPc(stringObjectMap.get("Chg").toString());
+// stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct").toString()+"%");
+// stockRealTimeBean.setTime(stringObjectMap.get("Time").toString());
+// RedisKeyUtil.setCacheRealTimeStock(EStockType.US,stockRealTimeBean);
+// ObjectMapper objectMapper = new ObjectMapper();
+// try {
+// if(!stockRealTimeBean.getPcp().contains("-")){
+// stockRealTimeBean.setPcp("+"+stringObjectMap.get("ChgPct").toString()+"%");
+// }
+// String json = objectMapper.writeValueAsString(stockRealTimeBean);
+// sendLoca(json);
+// StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
+// RedisKeyUtil.setCacheRealTimeStock(EStockType.US,stockDetailBean);
+// } catch (JsonProcessingException e) {
+// throw new RuntimeException(e);
+// }
+//
+// }else{
+// log.error("websocket 消息错误："+s);
+// }
+// }
+//
+// public static Map<String, String> jsonToMap(String json) {
+// Gson gson = new Gson();
+// Type type = new TypeToken<Map<String, String>>(){}.getType();
+// return gson.fromJson(json, type);
+// }
+//
+// @Override
+// public void onClose(int i, String s, boolean b) {
+// log.info("websocket 印度股票 关闭"+1);
+// }
+//
+// @Override
+// public void onError(Exception e) {
+// log.info("websocket 错误");
+// }
+//
+// public void sendLoca(String message) {
+// try {
+// // 准备 form-data 参数
+// List<BasicNameValuePair> params = new ArrayList<>();
+// params.add(new BasicNameValuePair("message", message));
+//
+// // 设置编码格式为 UTF-8
+// UrlEncodedFormEntity entity = new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
+// httpPost.setEntity(entity); // 设置 HttpPost 对象的参数
+//
+// // 发送请求
+// HttpResponse response = httpClient.execute(httpPost);
+//
+// // 处理响应
+// int statusCode = response.getStatusLine().getStatusCode();
+// } catch (IOException e) {
+// log.error("Http 请求错误", e);
+// }
+// }
+//}
--
Gitblit v1.9.3