From 5a8a43d5edb7af016b76246d9e9f661f4363342e Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 18 Apr 2024 11:13:24 +0800
Subject: [PATCH] 修改自选BUG 汇率
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 426 ++++++++++++++++++----------------------------------
1 files changed, 148 insertions(+), 278 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 8560221..f469776 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nq.dao.*;
+import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.service.*;
@@ -103,72 +104,64 @@
IUserAssetsServices iUserAssetsServices;
@Autowired
- TradingHourServiceImpl tradingHourService;
+ ITradingHourService tradingHourService;
+
+ @Autowired
+ IPriceServices priceServices;
@Transactional
- public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) throws Exception {
+ public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
SiteProduct siteProduct = iSiteProductService.getProductSetting();
User user = this.iUserService.getCurrentRefreshUser(request);
if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
- return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
+ return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
}
-
+ SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
+ // 手续费率
+ BigDecimal siteSettingBuyFee = siteSetting.getBuyFee();
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("Order failed, account has been locked");
- }
-
- SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
- if (siteSetting == null) {
- log.error("下单出错，网站设置表不存在");
- return ServerResponse.createByErrorMsg("Order failed, system setting error");
+ return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定",request);
}
Stock stock = stockMapper.selectByPrimaryKey(stockId);
if (stock == null) {
- return ServerResponse.createByErrorMsg("Order failed, stock code error");
+ return ServerResponse.createByErrorMsg("订单失败，股票代码不存在",request);
}
//判断股票是否在可交易时间段
- Boolean b = tradingHourService.timeCheck();
+ Boolean b = tradingHourService.timeCheck(stock.getStockCode());
if (!b) {
- return ServerResponse.createByErrorMsg("Order failed, not in the stock trading session");
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内",request);
}
if (stock.getIsLock() != 0) {
- return ServerResponse.createByErrorMsg("Order failed, shares cannot be traded at present");
+ return ServerResponse.createByErrorMsg("订单失败,股票被锁定",request);
}
- BigDecimal now_price;
//股票类型 现价 数据源的处理
- StockListVO stockListVO = StockApi.getStockRealTime(stock);
- now_price = new BigDecimal(stockListVO.getNowPrice());
+ BigDecimal nowPrice = priceServices.getNowPrice(stock.getStockCode());
- if (now_price.compareTo(new BigDecimal("0")) == 0) {
- return ServerResponse.createByErrorMsg("Quote 0, please try again later");
+ if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
+ return ServerResponse.createByErrorMsg("报价0，请稍后再试",request);
}
- BigDecimal buy_amt = now_price.multiply(new BigDecimal(buyNum));
+ BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum));
+ BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(),user.getId());
- if(userAssets.getAvailableBalance().compareTo(buy_amt)<0){
- return ServerResponse.createByErrorMsg("Order failed,Insufficient balance");
-
+ if(userAssets.getAvailableBalance().compareTo(buyAmt.add(orderFree))<0){
+ return ServerResponse.createByErrorMsg("订单失败，余额不足",request);
}
-
-
UserPosition userPosition = new UserPosition();
-
if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
userPosition.setProfitTargetPrice(profitTarget);
}
if (stopTarget != null && stopTarget.compareTo(new BigDecimal("0")) > 0) {
userPosition.setStopTargetPrice(stopTarget);
}
-
-
userPosition.setPositionType(user.getAccountType());
userPosition.setPositionSn(KeyUtils.getUniqueKey());
userPosition.setUserId(user.getId());
@@ -180,7 +173,7 @@
userPosition.setStockSpell(stock.getStockSpell());
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
- userPosition.setBuyOrderPrice(now_price);
+ userPosition.setBuyOrderPrice(nowPrice);
userPosition.setOrderDirection((buyType.intValue() == 0) ? "买涨" : "买跌");
userPosition.setOrderNum(buyNum);
if (stock.getStockPlate() != null) {
@@ -188,31 +181,21 @@
}
userPosition.setIsLock(Integer.valueOf(0));
userPosition.setOrderLever(lever);
- userPosition.setOrderTotalPrice(buy_amt);
- BigDecimal allStayFee = BigDecimal.valueOf(0);
- userPosition.setOrderStayFee(allStayFee);
- userPosition.setOrderStayDays(1);
+ userPosition.setOrderTotalPrice(buyAmt);
+ // 手续费
- BigDecimal buy_fee_amt = BigDecimal.valueOf(0);
- log.info("用户购买手续费（配资后总资金 * 百分比） = {}", buy_fee_amt);
- userPosition.setOrderFee(buy_fee_amt);
-
- BigDecimal buy_yhs_amt = BigDecimal.valueOf(0);
- log.info("用户购买印花税（配资后总资金 * 百分比） = {}", buy_yhs_amt);
- userPosition.setOrderSpread(buy_yhs_amt);
-
- BigDecimal spread_rate_amt = new BigDecimal("0");
-
- userPosition.setSpreadRatePrice(spread_rate_amt);
+ userPosition.setOrderFee(orderFree);
+ userPosition.setOrderSpread(BigDecimal.ZERO);
+ userPosition.setSpreadRatePrice(BigDecimal.ZERO);
BigDecimal profit_and_lose = new BigDecimal("0");
userPosition.setProfitAndLose(profit_and_lose);
- BigDecimal all_profit_and_lose = profit_and_lose.subtract(buy_fee_amt).subtract(buy_yhs_amt).subtract(spread_rate_amt);
- userPosition.setAllProfitAndLose(all_profit_and_lose);
+ userPosition.setAllProfitAndLose(profit_and_lose.add(orderFree));
userPosition.setOrderStayDays(Integer.valueOf(0));
- userPosition.setOrderStayFee(new BigDecimal("0"));
- this.userPositionMapper.insert(userPosition);
- iUserAssetsServices.availablebalanceChange(stock.getStockType(),user.getId(), EUserAssets.BUY,buy_amt.negate(),"","");
- return ServerResponse.createBySuccessMsg("Order successful");
+ userPosition.setOrderStayFee(BigDecimal.ZERO);
+ userPositionMapper.insert(userPosition);
+ iUserAssetsServices.availablebalanceChange(stock.getStockType(),user.getId(), EUserAssets.BUY,buyAmt.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(stock.getStockType(),user.getId(), EUserAssets.HANDLING_CHARGE,orderFree,"","");
+ return ServerResponse.createBySuccessMsg("下单成功",request);
}
@@ -226,7 +209,7 @@
if (positionSn.contains("index")) {
UserIndexPosition userIndexPosition = userIndexPositionMapper.selectIndexPositionBySn(positionSn.replace("index", ""));
if (userIndexPosition == null) {
- return ServerResponse.createByErrorMsg("指数持仓单不存在");
+ return ServerResponse.createByErrorMsg("指数持仓单不存在",request);
}
if (profitTarget != null && profitTarget > 0) {
userIndexPosition.setProfitTargetPrice(BigDecimal.valueOf(profitTarget));
@@ -234,13 +217,12 @@
if (stopTarget != null && stopTarget > 0) {
userIndexPosition.setStopTargetPrice(BigDecimal.valueOf(stopTarget));
}
- log.info("指数止盈线" + profitTarget + "-------指数止损线" + stopTarget);
update = this.userIndexPositionMapper.updateByPrimaryKeySelective(userIndexPosition);
} else {
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
if (userPosition == null) {
- return ServerResponse.createByErrorMsg("持仓记录不存在");
+ return ServerResponse.createByErrorMsg("持仓记录不存在",request);
}
if (profitTarget != null && profitTarget > 0) {
userPosition.setProfitTargetPrice(BigDecimal.valueOf(profitTarget));
@@ -252,128 +234,130 @@
update = this.userPositionMapper.updateByPrimaryKeySelective(userPosition);
}
if (update > 0) {
- return ServerResponse.createBySuccessMsg("修改成功");
+ return ServerResponse.createBySuccessMsg("修改成功",request);
} else {
- return ServerResponse.createByErrorMsg("修改失败");
+ return ServerResponse.createByErrorMsg("修改失败",request);
}
}
@Transactional
- public ServerResponse sell(String positionSn, int doType) throws Exception {
- SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
- if (siteSetting == null) {
- log.error("平仓出错，网站设置表不存在");
- return ServerResponse.createByErrorMsg("Order failed, system setting error");
- }
- SiteProduct siteProduct = iSiteProductService.getProductSetting();
+ public ServerResponse sell(String positionSn, int doType){
UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
- if (doType != 0) {
-// if (userPosition.getStockGid().contains(EStockType.US.getCode())) {
-// String am_begin = siteSetting.getTransAmBeginUs();
-// String am_end = siteSetting.getTransAmEndUs();
-// String pm_begin = siteSetting.getTransPmBeginUs();
-// String pm_end = siteSetting.getTransPmEndUs();
-// boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
-// boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
-// if (!am_flag && !pm_flag) {
-// return ServerResponse.createByErrorMsg("平仓失败，不在交易时段内");
-// }
-// } else {
-// String am_begin = siteSetting.getTransAmBegin();
-// String am_end = siteSetting.getTransAmEnd();
-// String pm_begin = siteSetting.getTransPmBegin();
-// String pm_end = siteSetting.getTransPmEnd();
-// boolean am_flag = BuyAndSellUtils.isTransTime(am_begin, am_end);
-// boolean pm_flag = BuyAndSellUtils.isTransTime(pm_begin, pm_end);
-// if (!am_flag && !pm_flag) {
-// return ServerResponse.createByErrorMsg("Order failed,Out of trading hours");
-// }
-// }
-// if (siteProduct.getHolidayDisplay()) {
-// return ServerResponse.createByErrorMsg("No trading on weekends or holidays！");
-// }
- //判断股票是否在可交易时间段
- Boolean b = tradingHourService.timeCheck();
- if (!b) {
- return ServerResponse.createByErrorMsg("Order failed, not in the stock trading session");
- }
-
+ BigDecimal siitteBuyFee = iSiteSettingService.getSiteSetting().getBuyFee();
+ Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
+ if (!b) {
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
}
-
-
if (userPosition == null) {
- return ServerResponse.createByErrorMsg("Closing failed, order does not exist");
+ return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
}
-
User user = this.userMapper.selectById(userPosition.getUserId());
if (user == null) {
- return ServerResponse.createByErrorMsg("Closed position failed, user does not exist");
+ return ServerResponse.createByErrorMsg("平仓失败,用户不存在");
}
-
- /*实名认证开关开启*/
- if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
-
- return ServerResponse.createByErrorMsg("Closing failed, user is locked");
-
- }
-
-
if (userPosition.getSellOrderId() != null) {
- return ServerResponse.createByErrorMsg("Closing failed, this order is closed");
+ return ServerResponse.createByErrorMsg("平仓失败, 订单已平仓");
}
-
if (1 == userPosition.getIsLock().intValue()) {
return ServerResponse.createByErrorMsg("this order is closed " + userPosition.getLockMsg());
}
- BigDecimal now_price;
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
- //股票卖出的 价格 数据源
-
- StockListVO stockListVO = StockApi.getStockRealTime(stock);
- now_price = new BigDecimal(stockListVO.getNowPrice());
- if (stockListVO.getNowPrice() == null) {
- return ServerResponse.createByErrorMsg("Failed to close position, failed to obtain stock information");
+ BigDecimal nowPrice = priceServices.getNowPrice(userPosition.getStockCode());
+ if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
+ return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试");
}
- if (now_price.compareTo(new BigDecimal("0")) != 1) {
- log.error("股票 = {} 收到报价 = {}", userPosition.getStockName(), now_price);
- return ServerResponse.createByErrorMsg("Quote 0, closing failed, please try again later");
- }
-
userPosition.setSellOrderId(GeneratePosition.getPositionId());
- userPosition.setSellOrderPrice(now_price);
+ userPosition.setSellOrderPrice(nowPrice);
userPosition.setSellOrderTime(new Date());
+
+ BigDecimal sellOrderTotel = nowPrice.multiply(new BigDecimal(userPosition.getOrderNum()));
+ BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);
userPositionMapper.updateById(userPosition);
- userAssetsServices.availablebalanceChange(stock.getStockType(),userPosition.getUserId(),EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
+ userAssetsServices.availablebalanceChange(stock.getStockType(),
+ userPosition.getUserId(),EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
userPosition.getOrderTotalPrice(),"","");
+ userAssetsServices.availablebalanceChange(stock.getStockType(),
+ userPosition.getUserId(),EUserAssets.HANDLING_CHARGE,
+ xsPrice,"","");
+
+ PositionProfitVO profitVO = UserPointUtil.getPositionProfitVO(userPosition,priceServices.getNowPrice(userPosition.getStockCode()));
userAssetsServices.availablebalanceChange(stock.getStockType(),userPosition.getUserId(),EUserAssets.CLOSE_POSITION,
- userPosition.getProfitAndLose() ,"","");
- return ServerResponse.createBySuccessMsg("Closed position successfully！");
+ profitVO.getAllProfitAndLose() ,"","");
+ return ServerResponse.createBySuccessMsg("平仓成功!");
+ }
+
+
+ @Transactional
+ public ServerResponse sell(String positionSn, int doType,HttpServletRequest request){
+ UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
+ BigDecimal siitteBuyFee = iSiteSettingService.getSiteSetting().getBuyFee();
+ Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
+ if (!b) {
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内",request);
+ }
+ if (userPosition == null) {
+ return ServerResponse.createByErrorMsg("平仓失败，订单不存在",request);
+ }
+ User user = this.userMapper.selectById(userPosition.getUserId());
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("平仓失败,用户不存在",request);
+ }
+ if (userPosition.getSellOrderId() != null) {
+ return ServerResponse.createByErrorMsg("平仓失败, 订单已平仓",request);
+ }
+ if (1 == userPosition.getIsLock().intValue()) {
+ return ServerResponse.createByErrorMsg("this order is closed " + userPosition.getLockMsg());
+ }
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
+ BigDecimal nowPrice = priceServices.getNowPrice(userPosition.getStockCode());
+ if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
+ return ServerResponse.createByErrorMsg("报价0，平仓失败，请稍后再试",request);
+ }
+ userPosition.setSellOrderId(GeneratePosition.getPositionId());
+ userPosition.setSellOrderPrice(nowPrice);
+ userPosition.setSellOrderTime(new Date());
+
+ BigDecimal sellOrderTotel = nowPrice.multiply(new BigDecimal(userPosition.getOrderNum()));
+ BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);
+ userPositionMapper.updateById(userPosition);
+ userAssetsServices.availablebalanceChange(stock.getStockType(),
+ userPosition.getUserId(),EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
+ userPosition.getOrderTotalPrice(),"","");
+ userAssetsServices.availablebalanceChange(stock.getStockType(),
+ userPosition.getUserId(),EUserAssets.HANDLING_CHARGE,
+ xsPrice,"","");
+
+ PositionProfitVO profitVO = UserPointUtil.getPositionProfitVO(userPosition,priceServices.getNowPrice(userPosition.getStockCode()));
+ userAssetsServices.availablebalanceChange(stock.getStockType(),userPosition.getUserId(),EUserAssets.CLOSE_POSITION,
+ profitVO.getAllProfitAndLose() ,"","");
+ return ServerResponse.createBySuccessMsg("平仓成功!",request);
}
@Transactional
@Override
public ServerResponse allSell(HttpServletRequest request,String stockType) throws Exception{
//判断股票是否在可交易时间段
- Boolean b = tradingHourService.timeCheck();
- if (!b) {
- return ServerResponse.createByErrorMsg("Order failed, not in the stock trading session");
- }
User user = iUserService.getCurrentUser(request);
- if(user == null){
- return ServerResponse.createByErrorMsg("Please login");
- }
QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id",user.getId());
- queryWrapper.eq("stock_gid",stockType);
- queryWrapper.isNull("sell_order_id");
+ if(stockType.equals(EStockType.US.getCode())){
+ queryWrapper.eq("user_id",user.getId());
+ queryWrapper.isNull("sell_order_id");
+ queryWrapper.or().eq("stock_gid",EStockType.US.getCode());
+
+ }else{
+ queryWrapper.eq("user_id",user.getId());
+ queryWrapper.eq("stock_gid",stockType);
+ 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);
}
- return ServerResponse.createBySuccessMsg("Closed position successfully！");
+ return ServerResponse.createBySuccessMsg("平仓成功!");
}
//用户追加保证金操作
@@ -519,23 +503,33 @@
return ServerResponse.createByErrorMsg("删除失败");
}
+ @Override
+ public UserPositionVO findByPostionSn(String positionSn) {
+ UserPosition userPosition = userPositionMapper.selectOne(new QueryWrapper<UserPosition>().eq("position_sn",positionSn));
+ if(userPosition == null){
+ return null;
+ }
+
+ return UserPointUtil.assembleUserPositionVO(userPosition,priceServices.getNowPrice(userPosition.getStockCode()));
+ }
+
public ServerResponse findMyPositionByCodeAndSpell(String stockCode, String stockSpell,
Integer state, HttpServletRequest request,
int pageNum, int pageSize, String stockType) {
User user = this.iUserService.getCurrentUser(request);
PageHelper.startPage(pageNum, pageSize);
-
-
- List<UserPosition> userPositions = this.userPositionMapper.
+ List<UserPosition> userPositions;
+ userPositions = userPositionMapper.
findMyPositionByCodeAndSpell(user.getId(),
stockCode, stockSpell,
state, stockType);
+
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
if (userPositions.size() > 0) {
for (UserPosition position : userPositions) {
- UserPositionVO userPositionVO = assembleUserPositionVO(position);
+ UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,priceServices.getNowPrice(position.getStockCode()));
userPositionVOS.add(userPositionVO);
}
}
@@ -552,33 +546,10 @@
BigDecimal allProfitAndLose = new BigDecimal("0");
BigDecimal allFreezAmt = new BigDecimal("0");
for (UserPosition position : userPositions) {
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", position.getStockCode()));
- StockListVO stockListVO = StockApi.getStockRealTime(
- stock);
- if (stockListVO.getNowPrice() == null) {
- stockListVO.setNowPrice("0");
- }
- BigDecimal nowPrice = new BigDecimal(stockListVO.getNowPrice());
- if (nowPrice.compareTo(new BigDecimal("0")) != 0) {
- BigDecimal buyPrice = position.getBuyOrderPrice();
- BigDecimal subPrice = nowPrice.subtract(buyPrice);
- BigDecimal profit_and_lose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
- if ("买跌".equals(position.getOrderDirection())) {
- profit_and_lose = profit_and_lose.negate();
- }
- BigDecimal total_fee = position.getOrderFee().add(position.getOrderSpread()).add(position.getOrderStayFee());
- BigDecimal position_profit = profit_and_lose.subtract(total_fee);
- allProfitAndLose = allProfitAndLose.add(position_profit);
- BigDecimal position_freez = position.getOrderTotalPrice().divide(new BigDecimal(position.getOrderLever().intValue()), 2, 4);
- allFreezAmt = allFreezAmt.add(position_freez).add(position.getMarginAdd());
- continue;
- }
- log.info("查询所有持仓单的总盈亏，现价返回0，当前为集合竞价");
- }
- //加上分仓交易保证金
- List<FundsApply> fundsApplyList = fundsApplyMapper.getUserMarginList(userId);
- for (FundsApply fundsApply : fundsApplyList) {
- allFreezAmt = allFreezAmt.add(fundsApply.getMargin());
+ BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
+ PositionProfitVO positionProfitVO = UserPointUtil.getPositionProfitVO(position,nowPrice);
+ allProfitAndLose.add(positionProfitVO.getAllProfitAndLose());
+ allFreezAmt.add(positionProfitVO.getProfitAndLose());
}
@@ -590,41 +561,15 @@
@Override
public PositionVO findUserPositionAllProfitAndLose(Integer userId, String stockType) {
- List<UserPosition> userPositions = this.userPositionMapper.findPositionByUserIdAndSellId(userId, stockType);
-
+ List<UserPosition> userPositions = userPositionMapper.findPositionByUserIdAndSellId(userId, stockType);
BigDecimal allProfitAndLose = new BigDecimal("0");
BigDecimal allFreezAmt = new BigDecimal("0");
for (UserPosition position : userPositions) {
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", position.getStockCode()));
- StockListVO stockListVO = StockApi.getStockRealTime(
- stock);
- if (stockListVO.getNowPrice() == null) {
- stockListVO.setNowPrice("0");
- }
- BigDecimal nowPrice = new BigDecimal(stockListVO.getNowPrice());
- if (nowPrice.compareTo(new BigDecimal("0")) != 0) {
- BigDecimal buyPrice = position.getBuyOrderPrice();
- BigDecimal subPrice = nowPrice.subtract(buyPrice);
- BigDecimal profit_and_lose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
- if ("买跌".equals(position.getOrderDirection())) {
- profit_and_lose = profit_and_lose.negate();
- }
- BigDecimal total_fee = position.getOrderFee().add(position.getOrderSpread()).add(position.getOrderStayFee());
- BigDecimal position_profit = profit_and_lose.subtract(total_fee);
- allProfitAndLose = allProfitAndLose.add(position_profit);
- BigDecimal position_freez = position.getOrderTotalPrice().divide(new BigDecimal(position.getOrderLever().intValue()), 2, 4);
- allFreezAmt = allFreezAmt.add(position_freez).add(position.getMarginAdd());
- continue;
- }
- log.info("查询所有持仓单的总盈亏，现价返回0，当前为集合竞价");
+ BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
+ PositionProfitVO positionProfitVO = UserPointUtil.getPositionProfitVO(position,nowPrice);
+ allProfitAndLose.add(positionProfitVO.getAllProfitAndLose());
+ allFreezAmt.add(positionProfitVO.getProfitAndLose());
}
- //加上分仓交易保证金
- List<FundsApply> fundsApplyList = fundsApplyMapper.getUserMarginList(userId);
- for (FundsApply fundsApply : fundsApplyList) {
- allFreezAmt = allFreezAmt.add(fundsApply.getMargin());
- }
-
-
PositionVO positionVO = new PositionVO();
positionVO.setAllProfitAndLose(allProfitAndLose);
positionVO.setAllFreezAmt(allFreezAmt);
@@ -1081,7 +1026,7 @@
adminPositionVO.setStockPlate(position.getStockPlate());
- PositionProfitVO positionProfitVO = getPositionProfitVO(position);
+ PositionProfitVO positionProfitVO = UserPointUtil.getPositionProfitVO(position,priceServices.getNowPrice(position.getStockCode()));
adminPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
adminPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
adminPositionVO.setNow_price(positionProfitVO.getNowPrice());
@@ -1123,7 +1068,7 @@
agentPositionVO.setStockPlate(position.getStockPlate());
- PositionProfitVO positionProfitVO = getPositionProfitVO(position);
+ PositionProfitVO positionProfitVO = UserPointUtil.getPositionProfitVO(position,priceServices.getNowPrice(position.getStockCode()));
agentPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
agentPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
agentPositionVO.setNow_price(positionProfitVO.getNowPrice());
@@ -1132,83 +1077,8 @@
return agentPositionVO;
}
- private UserPositionVO assembleUserPositionVO(UserPosition position) {
- UserPositionVO userPositionVO = new UserPositionVO();
- userPositionVO.setId(position.getId());
- userPositionVO.setPositionType(position.getPositionType());
- userPositionVO.setPositionSn(position.getPositionSn());
- userPositionVO.setUserId(position.getUserId());
- userPositionVO.setNickName(position.getNickName());
- userPositionVO.setAgentId(position.getAgentId());
- userPositionVO.setStockName(position.getStockName());
- userPositionVO.setStockCode(position.getStockCode());
- userPositionVO.setStockGid(position.getStockGid());
- userPositionVO.setStockSpell(position.getStockSpell());
- userPositionVO.setBuyOrderId(position.getBuyOrderId());
- userPositionVO.setBuyOrderTime(position.getBuyOrderTime());
- userPositionVO.setBuyOrderPrice(position.getBuyOrderPrice());
- userPositionVO.setSellOrderId(position.getSellOrderId());
- userPositionVO.setSellOrderTime(position.getSellOrderTime());
- userPositionVO.setSellOrderPrice(position.getSellOrderPrice());
- userPositionVO.setProfitTargetPrice(position.getProfitTargetPrice());
- userPositionVO.setStopTargetPrice(position.getStopTargetPrice());
- userPositionVO.setOrderDirection(position.getOrderDirection());
- userPositionVO.setOrderNum(position.getOrderNum());
- userPositionVO.setOrderLever(position.getOrderLever());
- userPositionVO.setOrderTotalPrice(position.getOrderTotalPrice());
- userPositionVO.setOrderFee(position.getOrderFee());
- userPositionVO.setOrderSpread(position.getOrderSpread());
- userPositionVO.setOrderStayFee(position.getOrderStayFee());
- userPositionVO.setOrderStayDays(position.getOrderStayDays());
- userPositionVO.setMarginAdd(position.getMarginAdd());
- userPositionVO.setStockPlate(position.getStockPlate());
- userPositionVO.setSpreadRatePrice(position.getSpreadRatePrice());
-
- PositionProfitVO positionProfitVO = getPositionProfitVO(position);
- userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
- userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
- userPositionVO.setNow_price(positionProfitVO.getNowPrice());
- return userPositionVO;
- }
-
- public PositionProfitVO getPositionProfitVO(UserPosition position) {
- BigDecimal profitAndLose = new BigDecimal("0");
- BigDecimal allProfitAndLose = new BigDecimal("0");
- String nowPrice = "";
-
- if (position.getSellOrderId() != null) {
-
- BigDecimal subPrice = position.getSellOrderPrice().subtract(position.getBuyOrderPrice());
- profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
- if ("买跌".equals(position.getOrderDirection())) {
- profitAndLose = profitAndLose.negate();
- }
- allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
- } else {
- StockListVO stockListVO = new StockListVO();
- StockCoin stockCoin = new StockCoin();
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", position.getStockCode()));
- stockListVO = StockApi.getStockRealTime(stock);
- nowPrice = stockListVO.getNowPrice();
- if (nowPrice == null) {
- nowPrice = String.valueOf(0);
- }
- BigDecimal subPrice = (new BigDecimal(nowPrice)).subtract(position.getBuyOrderPrice());
- profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
- if ("买跌".equals(position.getOrderDirection())) {
- profitAndLose = profitAndLose.negate();
- }
- //总盈亏= 浮动盈亏 – 手续费 – 印花税 – 留仓费 – 点差费
- allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
- }
- PositionProfitVO positionProfitVO = new PositionProfitVO();
- positionProfitVO.setProfitAndLose(profitAndLose);
- positionProfitVO.setAllProfitAndLose(allProfitAndLose);
- positionProfitVO.setNowPrice(nowPrice);
- return positionProfitVO;
- }
/*股票入仓最新top列表*/
@@ -1217,7 +1087,7 @@
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
if (userPositions.size() > 0) {
for (UserPosition position : userPositions) {
- UserPositionVO userPositionVO = assembleUserPositionVO(position);
+ UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,priceServices.getNowPrice(position.getStockCode()));
userPositionVOS.add(userPositionVO);
}
}
@@ -1234,7 +1104,7 @@
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
UserPositionVO userPositionVO = null;
if (position != null) {
- userPositionVO = assembleUserPositionVO(position);
+ userPositionVO = UserPointUtil.assembleUserPositionVO(position,priceServices.getNowPrice(position.getStockCode()));
}
userPositionVOS.add(userPositionVO);
--
Gitblit v1.9.3