From 6fea0d854481c680dffec2ed9edc894f5e0dcfd3 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 25 Aug 2025 20:34:37 +0800
Subject: [PATCH] bug
---
src/main/java/com/nq/service/impl/StockAiServiceImpl.java | 137 ++++++++++++++++++++-------------------------
1 files changed, 62 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
index b8d869b..07d4fa6 100644
--- a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import com.nq.Repository.ExchangeRateRepository;
import com.nq.common.ResponseCode;
import com.nq.common.ServerResponse;
import com.nq.dao.StockAiMapper;
@@ -12,9 +11,11 @@
import com.nq.enums.*;
import com.nq.pojo.*;
import com.nq.service.*;
+import com.nq.vo.stock.ai.StockAIOrderPositionVO;
import com.nq.vo.stock.ai.StockAiOrderTypeVO;
import com.nq.vo.stock.ai.StockAiOrderVO;
import com.nq.vo.stock.ai.StockAiVO;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,6 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
@Service("iStockAiService")
@@ -45,6 +45,8 @@
IUserService iUserService;
@Autowired
IUserAssetsServices iUserAssetsServices;
+ @Autowired
+ private UserAssetsServices userAssetsServices;
/**
* 获取上架ai产品
@@ -53,11 +55,12 @@
* @return
*/
@Override
- public ServerResponse getStockAiList(Integer pageNum, Integer pageSize) {
+ public ServerResponse getStockAiList(Integer pageNum, Integer pageSize, String stockName) {
try {
PageHelper.startPage(pageNum, pageSize);
List<StockAI> stockAiList = stockAiMapper.selectList(new QueryWrapper<StockAI>()
- .eq("status", EStockAIStatus.online.getValue()));
+ .eq("status", EStockAIStatus.online.getValue())
+ .eq(StringUtils.isNotBlank(stockName),"stock_name", stockName));
// 获取分页信息
PageInfo<StockAI> pageInfo = new PageInfo<>(stockAiList);
return ServerResponse.createBySuccess(pageInfo);
@@ -74,71 +77,59 @@
* @return
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse buyStockAi(Long id, BigDecimal buyNum, HttpServletRequest request) {
try {
User user = iUserService.getCurrentUser(request);
if (user == null ){
- return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
}
Object lock = locks.computeIfAbsent(Long.valueOf(user.getId()), k -> new Object());
synchronized (lock){
SiteProduct siteProduct = iSiteProductService.getProductSetting();
if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("订单失败，请先实名认证");
+ return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
}
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定");
+ return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定", request);
}
StockAI stockAI = stockAiMapper.selectById(id);
if (stockAI == null) {
- return ServerResponse.createByErrorMsg("订单失败，AI股票不存在");
+ return ServerResponse.createByErrorMsg("订单失败，AI股票不存在", request);
}
if (!stockAI.getStatus().equals(EStockAIStatus.online.getValue())) {
- return ServerResponse.createByErrorMsg("订单失败，AI股票已下架");
+ return ServerResponse.createByErrorMsg("订单失败，AI股票已下架", request);
}
if(buyNum.compareTo(stockAI.getMinPrice()) < 0){
- return ServerResponse.createByErrorMsg("最低购买数量" + stockAI.getMinPrice());
+ return ServerResponse.createByErrorMsg("最低购买数量" + stockAI.getMinPrice(), request);
}
//获取用户账户
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), user.getId());
- /*BigDecimal finalBuyNum = buyNum; //购买金额
- //如果不是墨西哥币需要转换金额
- if (!stockAI.getStockType().equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(stockAI.getStockType());
-
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(stockType.getSymbol(), EStockType.MX.getSymbol())
- .orElse(null);
- if (exchangeRate == null) {
- return ServerResponse.createByErrorMsg("当前货币汇率无法转换");
- }
- //转换为墨西哥币
- buyNum = iUserAssetsServices.exchangeAmountByRate(buyNum, exchangeRate.getRata());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockAI.getStockType(), user.getId());
+ /*BigDecimal finalBuyNum = buyNum;
+ //如果不是默认货币需要转换金额
+ if (!stockAI.getStockType().equals(EStockType.getDefault().getCode())) {
+ buyNum = userAssetsServices.exchangeAmountByRate(stockAI.getStockType(), buyNum);
}*/
if(buyNum.compareTo(userAssets.getAvailableBalance()) > 0){
- return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance());
+ return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance(), request);
}
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金");
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
-
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), user.getId(), EUserAssets.BUY_AI, buyNum, null);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), user.getId(), EUserAssets.BUY_AI, buyNum);
StockAIOrder stockAIOrder = new StockAIOrder();
stockAIOrder.setUserId(user.getId());
- stockAIOrder.setStockAiId(id);
+ stockAIOrder.setStockAiId(id.intValue());
stockAIOrder.setBuyDate(new Date());
stockAIOrder.setBuyAmount(buyNum);
stockAIOrder.setRemainAmount(buyNum);
stockAIOrder.setRealEarning(BigDecimal.valueOf(0));
stockAIOrder.setStatus(EStockAIOrderStatus.wait.getStatus()); //等待审核
stockAiOrderMapper.insert(stockAIOrder);
- return ServerResponse.createBySuccessMsg("下单成功");
+ return ServerResponse.createBySuccessMsg("下单成功", request);
}
} catch (Exception e) {
log.error("StockAiService buyStockAiList {}", e.getMessage());
@@ -159,7 +150,7 @@
try {
User user = iUserService.getCurrentUser(request);
if (user == null ){
- return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
}
PageHelper.startPage(pageNum, pageSize);
List<StockAiOrderTypeVO> stockAIOrders = stockAiOrderMapper.getStockAiOrderList(user.getId(), status);
@@ -207,12 +198,12 @@
if (model == null) {
return ServerResponse.createByErrorMsg("editStockAi model is null");
}
- if (model.getStockType().isEmpty() || model.getStockName().isEmpty() || model.getMinPrice() == null
- || model.getSuccessRate() == null || model.getExpectedEarning() == null || model.getStatus().isEmpty()) {
+ if (StringUtils.isBlank(model.getStockType()) || StringUtils.isBlank(model.getStockName()) || model.getMinPrice() == null
+ || model.getSuccessRate() == null || model.getExpectedEarning() == null || StringUtils.isBlank(model.getStatus())) {
return ServerResponse.createByErrorMsg("请完善必填信息");
}
- if (!model.getStockType().equals(EStockType.US.getCode()) && !model.getStockType().equals(EStockType.MX.getCode())) {
- return ServerResponse.createByErrorMsg("只能选择美股或墨西哥股");
+ if (!EStockType.isExistByCode(model.getStockType())) {
+ return ServerResponse.createByErrorMsg("股票市场不存在");
}
//新增
if (model.getId() == null) {
@@ -228,6 +219,7 @@
}
return ServerResponse.createBySuccess("操作成功");
} catch (Exception e) {
+ e.printStackTrace();
log.error(e.getMessage(), e);
}
return ServerResponse.createByError();
@@ -275,7 +267,7 @@
@Override
public ServerResponse openPosition(StockAIOrderPosition model) {
try {
- Object lock = locks.computeIfAbsent(model.getStockAiOrderId(), k -> new Object());
+ Object lock = locks.computeIfAbsent(Long.valueOf(model.getStockAiOrderId()), k -> new Object());
synchronized (lock) {
StockAIOrder stockAIOrder = stockAiOrderMapper.selectById(model.getStockAiOrderId());
if (stockAIOrder == null) {
@@ -296,6 +288,7 @@
BigDecimal earnings = model.getCoverPrice().subtract(model.getStockPrice()).multiply(BigDecimal.valueOf(model.getStockNum()));
model.setCreatDate(new Date());
model.setEarnings(earnings);
+ model.setStatus(0);
stockAIOrder.setRealEarning(stockAIOrder.getRealEarning().add(earnings));
//保存
@@ -310,6 +303,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse orderOperation(Long id, String status) {
try {
Object lock = locks.computeIfAbsent(id, k -> new Object());
@@ -331,27 +325,14 @@
StockAI stockAI = stockAiMapper.selectById(stockAIOrder.getStockAiId());
//买入金额
BigDecimal buyNum = stockAIOrder.getBuyAmount();
- /*//如果不是墨西哥币需要转换金额
- if (!stockAI.getStockType().equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(stockAI.getStockType());
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(stockType.getSymbol(), EStockType.MX.getSymbol())
- .orElse(null);
- if (exchangeRate == null) {
- return ServerResponse.createByErrorMsg("请先设置当前货币汇率");
- }
- //转换为墨西哥币
- buyNum = iUserAssetsServices.exchangeAmountByRate(buyNum, exchangeRate.getRata());
- }*/
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.BUY_AI_REJECT, buyNum, null);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.BUY_AI_REJECT, buyNum);
} else if (status.equals(EStockAIOrderStatus.finished.getStatus())) {
if (!stockAIOrder.getStatus().equals(EStockAIOrderStatus.passed.getStatus())) {
return ServerResponse.createByErrorMsg("只能结算申请通过订单");
}
//结算 TODO结算建仓 计算收益
/*//所有建仓
+
List<StockAIOrderPosition> stockAIOrderPositionList = stockAiOrderPositionMapper
.selectList(new QueryWrapper<StockAIOrderPosition>()
.eq("stock_ai_order_id", id));
@@ -366,26 +347,12 @@
amount = amount.add(earningsSUM);
}*/
StockAI stockAI = stockAiMapper.selectById(stockAIOrder.getStockAiId());
- //收益+本金
- BigDecimal amount = stockAIOrder.getBuyAmount().add(stockAIOrder.getRealEarning());
- //需要解冻金额
- BigDecimal buyAmount = stockAIOrder.getBuyAmount();
- /*//如果不是墨西哥币需要转换金额
- if (!stockAI.getStockType().equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(stockAI.getStockType());
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(stockType.getSymbol(), EStockType.MX.getSymbol())
- .orElse(null);
- if (exchangeRate == null) {
- return ServerResponse.createByErrorMsg("请先设置当前货币汇率");
- }
- //转换为墨西哥币
- amount = iUserAssetsServices.exchangeAmountByRate(amount, exchangeRate.getRata());
- buyAmount = iUserAssetsServices.exchangeAmountByRate(buyAmount, exchangeRate.getRata());
- }*/
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT, amount, buyAmount);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ //结算修改为平仓状态
+ stockAiOrderPositionMapper.updateStatusByOrderId(stockAIOrder.getId(), 1);
+ //归还本金
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT, stockAIOrder.getBuyAmount());
+ //收益
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT_INT, stockAIOrder.getRealEarning());
}
stockAIOrder.setStatus(status);
stockAIOrder.setAuditDate(new Date());
@@ -393,7 +360,27 @@
return ServerResponse.createBySuccess("操作成功");
}
} catch (Exception e) {
- log.error("StockAiService openPosition error", e);
+ log.error("StockAiService orderOperation error", e);
+ }
+ return ServerResponse.createByError();
+ }
+
+ /**
+ * 建仓列表
+ * @param pageNum
+ * @param pageSize
+ * @param stockAiOrderId
+ * @return
+ */
+ @Override
+ public ServerResponse getPositionList(Integer pageNum, Integer pageSize, Integer stockAiOrderId) {
+ try {
+ PageHelper.startPage(pageNum, pageSize);
+ List<StockAIOrderPositionVO> positionVOList = stockAiOrderPositionMapper.getPositionListByOrderId(stockAiOrderId);
+ PageInfo<StockAIOrderPositionVO> pageInfo = new PageInfo<>(positionVOList);
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception e) {
+ log.error("StockAiService getPositionList error", e);
}
return ServerResponse.createByError();
}
--
Gitblit v1.9.3