From ec72fc1827d3e46a99d302dd3c9ca61411c70943 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 24 Jul 2025 14:41:25 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 28 +++--
src/main/resources/application.properties | 50 ---------
src/main/java/com/nq/ws/WebsocketRunClient.java | 4
src/main/java/com/nq/service/impl/StockServiceImpl.java | 7
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 3
src/main/resources/mapper/UserPositionMapper.xml | 2
src/main/java/com/nq/ws/MXWebsocketRunClient.java | 4
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 133 +++++++++++++------------
src/main/java/com/nq/service/IUserPositionService.java | 4
src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java | 6
10 files changed, 102 insertions(+), 139 deletions(-)
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index c5e1301..80fb389 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -84,9 +84,9 @@
ServerResponse updateProfitTarget(String positionSn, Integer profitTarget, Integer stopTarget, HttpServletRequest request);
- ServerResponse buyVipQc(String stockCode, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) throws Exception;
+ ServerResponse buyVipQc(String stockCode, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) throws Exception;
- ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request) throws Exception;
+ ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request);
ServerResponse buyStockDzList(HttpServletRequest request);
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 6146857..cd61cca 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -507,9 +507,10 @@
// stockListVO.setNowPrice(stockListVO.getNowPrice());
// }
// }
-
- stockAdminListVO.setNowPrice(stockListVO.getNowPrice());
- stockAdminListVO.setHcrate(stockListVO.getHcrate());
+ if (stockListVO != null) {
+ stockAdminListVO.setNowPrice(stockListVO.getNowPrice());
+ stockAdminListVO.setHcrate(stockListVO.getHcrate());
+ }
stockAdminListVO.setSpreadRate(stock.getSpreadRate());
ServerResponse serverResponse = selectRateByDaysAndStockCode(stock.getStockCode(), 3);
BigDecimal day3Rate = new BigDecimal("0");
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index c81c93c..70a8209 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1757,81 +1757,86 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request) throws Exception {
- /*实名认证开关开启*/
- SiteProduct siteProduct = iSiteProductService.getProductSetting();
- User user = this.iUserService.getCurrentRefreshUser(request);
+ public ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request){
+ try {
+ /*实名认证开关开启*/
+ SiteProduct siteProduct = iSiteProductService.getProductSetting();
+ User user = this.iUserService.getCurrentRefreshUser(request);
- if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
- }
- if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("Order failed, account has been locked");
- }
- StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", dzId));
- if (StringUtils.isNotEmpty(stockDz.getPassword()) && !Objects.equals(stockDz.getPassword(), password)) {
- return ServerResponse.createByErrorMsg("密码错误", request);
- }
- if (stockDz.getIsLock() != 0) {
- return ServerResponse.createByErrorMsg("股票被锁定,不能购买", request);
- }
- //价格处理
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", stockDz.getStockCode()));
+ if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
+ return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
+ }
+ if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
+ return ServerResponse.createByErrorMsg("Order failed, account has been locked");
+ }
+ StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", dzId));
+ if (StringUtils.isNotEmpty(stockDz.getPassword()) && !Objects.equals(stockDz.getPassword(), password)) {
+ return ServerResponse.createByErrorMsg("密码错误", request);
+ }
+ if (stockDz.getIsLock() != 0) {
+ return ServerResponse.createByErrorMsg("股票被锁定,不能购买", request);
+ }
+ //价格处理
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", stockDz.getStockCode()));
- UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
- if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
- }
+ UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+ }
- if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
- return ServerResponse.createByErrorMsg("不在内幕交易时间之内", request);
- }
+ if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
+ return ServerResponse.createByErrorMsg("不在内幕交易时间之内", request);
+ }
// BigDecimal nowPrice = priceServices.getNowPrice(stockDz.getStockCode()).multiply(stockDz.getDiscount());
- BigDecimal nowPrice = stockDz.getNowPrice();
+ BigDecimal nowPrice = stockDz.getNowPrice();
- if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
- return ServerResponse.createByErrorMsg("股票价格0,请重试", request);
- }
- if (stockDz.getStockNum() > num) {
- return ServerResponse.createByErrorMsg("最小购买数据" + stockDz.getStockNum(), request);
- }
+ if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
+ return ServerResponse.createByErrorMsg("股票价格0,请重试", request);
+ }
+ if (stockDz.getStockNum() > num) {
+ return ServerResponse.createByErrorMsg("最小购买数据" + stockDz.getStockNum(), request);
+ }
- BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+ BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
- BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num.intValue()));
- BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
- BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
- BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
- if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
- return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
- }
+ BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num.intValue()));
+ BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
+ BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
+ BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
+ if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
+ return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
+ }
- BigDecimal newBuyAmt = buyAmt;
- //如果不是墨西哥币需要转换金额
- if (!stock.getStockType().equals(EStockType.MX.getCode())) {
- newBuyAmt = userAssetsServices.exchangeAmountByRate(stock.getStockType(), buyAmt);
- }
- if(newBuyAmt.compareTo(userAssets.getAvailableBalance()) > 0){
- return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance(), request);
- }
+ BigDecimal newBuyAmt = buyAmt;
+ //如果不是墨西哥币需要转换金额
+ if (!stock.getStockType().equals(EStockType.MX.getCode())) {
+ newBuyAmt = userAssetsServices.exchangeAmountByRate(stock.getStockType(), buyAmt);
+ }
+ if(newBuyAmt.compareTo(userAssets.getAvailableBalance()) > 0){
+ return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance(), request);
+ }
- //判断审核开关
- if(stockDz.getSwitchType() == 1) {
+ //判断审核开关
+ if(stockDz.getSwitchType() == 1) {
+ UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
+ UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
+ userPositionCheckDz.setDzId(dzId);
+ userPositionCheckDzService.save(userPositionCheckDz);
+ return ServerResponse.createBySuccess("购买成功，等待审核", request);
+ }
+
+ // 创建UserPosition对象
UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
- UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
- userPositionCheckDz.setDzId(dzId);
- userPositionCheckDzService.save(userPositionCheckDz);
- return ServerResponse.createBySuccess("购买成功，等待审核", request);
+ userPositionMapper.insert(userPosition);
+ BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(newBuyAmt);
+ //已经转化 直接穿MEX类型
+ userAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.BUY, newBuyAmt.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ return ServerResponse.createBySuccess("购买成功", request);
+ } catch (Exception e) {
+ log.error("大宗下单异常{}", e.getMessage());
}
-
- // 创建UserPosition对象
- UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
- userPositionMapper.insert(userPosition);
- BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(newBuyAmt);
- //已经转化 直接穿MEX类型
- userAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.BUY, newBuyAmt.negate(),"","");
- iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
- return ServerResponse.createBySuccess("购买成功", request);
+ return ServerResponse.createByError();
}
private UserPosition getUserPosition(Integer dzId,Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index dacba97..3192693 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -311,19 +311,21 @@
}
}
}
- //退回资金 交易记录MEX
- MoneyLog moneyLog = new MoneyLog();
- EUserAssets eUserAssets = EUserAssets.BUY_RT;
- moneyLog.setDescs(eUserAssets.getDesc());
- moneyLog.setBeFore(before);
- moneyLog.setAfter(userAssets.getAvailableBalance().toString());
- moneyLog.setAmount(refundPrice.toString());
- moneyLog.setAccectType(EStockType.MX.getCode());
- moneyLog.setType(eUserAssets.getCode());
- moneyLog.setUserId(userAssets.getUserId()+"");
- moneyLog.setSymbol(EStockType.MX.getSymbol());
- moneyLog.setCreateTime(new Date());
- moneyLogMapper.insert(moneyLog);
+ //如果退回资金 add交易记录MEX
+ if (refundPrice.compareTo(BigDecimal.ZERO) > 0) {
+ MoneyLog moneyLog = new MoneyLog();
+ EUserAssets eUserAssets = EUserAssets.BUY_RT;
+ moneyLog.setDescs(eUserAssets.getDesc());
+ moneyLog.setBeFore(before);
+ moneyLog.setAfter(userAssets.getAvailableBalance().toString());
+ moneyLog.setAmount(refundPrice.toString());
+ moneyLog.setAccectType(EStockType.MX.getCode());
+ moneyLog.setType(eUserAssets.getCode());
+ moneyLog.setUserId(userAssets.getUserId()+"");
+ moneyLog.setSymbol(EStockType.MX.getSymbol());
+ moneyLog.setCreateTime(new Date());
+ moneyLogMapper.insert(moneyLog);
+ }
ret = userStockSubscribeMapper.update1(model);
userAssetsMapper.updateById(userAssets);
iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓
diff --git a/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java b/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
index 89f3c68..c5db358 100644
--- a/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
+++ b/src/main/java/com/nq/utils/translate/GoogleTranslateUtil.java
@@ -75,8 +75,8 @@
*/
public String translate(String content,String lang) {
- return content;
- /*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++) {
@@ -105,7 +105,7 @@
}
}
- return result.toString();*/
+ return result.toString();
}
public static void main(String[] args) throws Exception {
diff --git a/src/main/java/com/nq/ws/MXWebsocketRunClient.java b/src/main/java/com/nq/ws/MXWebsocketRunClient.java
index 135a63f..a434ddf 100644
--- a/src/main/java/com/nq/ws/MXWebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/MXWebsocketRunClient.java
@@ -99,12 +99,12 @@
@Override
public void onClose(int i, String s, boolean b) {
- log.info("websocket 墨西哥股票 关闭"+1);
+ log.info("websocket 墨西哥股票 关闭 {} ", i);
}
@Override
public void onError(Exception e) {
- log.info("websocket 墨西哥股票 错误");
+ log.info("websocket 墨西哥股票 错误{}", e.getMessage());
}
public void sendLoca(String message) {
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 5e2d6ec..4e6b9f8 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,6 +1,5 @@
package com.nq.ws;
-
import com.nq.enums.EStockType;
import com.nq.utils.PropertiesUtil;
import lombok.extern.slf4j.Slf4j;
@@ -67,4 +66,4 @@
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 5d9e127..005191e 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -102,12 +102,12 @@
@Override
public void onClose(int i, String s, boolean b) {
- log.info("websocket 美国股票 关闭"+1);
+ log.info("websocket 美国股票 关闭 {} ", i);
}
@Override
public void onError(Exception e) {
- log.info("websocket 美国股票 错误" + e.getMessage());
+ log.info("websocket 美国股票 错误{}", e.getMessage());
}
public void sendLoca(String message) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c30607d..32e7d60 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.durocaspitall.com/
+ftp.server.http.prefix=https://img.kuspitai.com/
redis1.ip=localhost
redis1.port=6379
@@ -39,58 +39,14 @@
agent.key.prefix=Mi
admin.super.name=18916320007
-
#股票key的地址
-#IN_HTTP_API = https://data.is4vc.com/v1
-#IN_WS_URL =ws://ws.is4vc.com:8001/websocket-server/v1
-#IN_KEY = r3ZAgtcYzuBizmqge2hK
-#IN_NEW_HTTP_API = http://api-in-2.js-stock.top/
-#IN_NEW_KEY = eVKtHt7aG4m6ozwWL9qG
-
-JS_IN_HTTP_API = http://api-in-3-socket.js-stock.top
-JS_IN_HTTP_URL = http://api-in-pro.js-stock.top/
-JS_IN_WS_URL = ws://api-in-pro-ws.js-stock.top
-JS_IN_KEY = xKChgi47AP1NMwMeYI3c
-
-#US_HTTP_API = http://api-us.js-stock.top/
-#US_WS_URL = ws://ws-us.js-stock.top
-#US_KEY = jZFrku4RGQjP87Hmq5tm
-
-HK_HTTP_API = http://test.js-stock.top/
-HK_WS_URL = ws://test-ws.js-stock.top
-HK_KEY = mG8QQDdjGuLjLnrryd0B
-
US_HTTP_API = http://api-us-v2.js-stock.top/
US_WS_URL = ws://api-us-v2-ws.js-stock.top
-US_KEY = Or066PtXGwrgsYt0kscq
+US_KEY = AKoSBQXFrcs02dgcRKde
MX_HTTP_API = http://api-mx.js-stock.top/
MX_WS_URL = ws://api-mx-ws.js-stock.top
-MX_KEY = 45cXikMKv49SuPIOemiF
-
-
-#HK_HTTP_API = http://api-v1.js-stock.top/
-#HK_WS_URL = ws://api-v1-ws.js-stock.top
-#HK_KEY = QgiqrYYZem1WWXWbHeT7
-
-
-HG_HTTP_API = http://test.js-stock.top/
-HG_WS_URL = ws://test-ws.js-stock.top
-HG_KEY = mG8QQDdjGuLjLnrryd0B
-
-
-
-TH_HTTP_API = http://test.js-stock.top/
-TH_WS_URL = ws://api-in-ws.js-stock.top
-TH_KEY = GBZAcUPLKZzDMDjvV9Ea
-
-MAS_HTTP_API = http://api-ms.js-stock.top/
-MAS_WS_URL = ws://api-ms-ws.js-stock.top
-MAS_KEY = PQWyZGrw7wRqdoWrvnY9
-
-SZHB_HTTP_API = https://api.huobi.pro/
-SZHB_WS_URL = ws://api-in-ws.js-stock.top
-SZHB_KEY = GBZAcUPLKZzDMDjvV9Ea
+MX_KEY = 1A4SY039JchL2y3UIFh8
#默认首页显示指数code
us_home_indices_code=15882,15881,16571
diff --git a/src/main/resources/mapper/UserPositionMapper.xml b/src/main/resources/mapper/UserPositionMapper.xml
index 34c6e59..a052158 100644
--- a/src/main/resources/mapper/UserPositionMapper.xml
+++ b/src/main/resources/mapper/UserPositionMapper.xml
@@ -557,7 +557,7 @@
null agent_id,
s.stock_name,
s.stock_code,
- s.stock_gid,
+ s.stock_type stock_gid,
s.stock_spell,
p.stock_ai_order_id buy_order_id,
p.creat_date buy_order_time,
--
Gitblit v1.9.3