src/main/java/com/nq/common/ResponseCode.java
@@ -4,7 +4,7 @@ public enum ResponseCode { SUCCESS(0, "SUCCESS"), ERROR(1, "ERROR"), NEED_LOGIN(10, "NEED_LOGIN"), NEED_LOGIN(401, "NEED_LOGIN"), ILLEGAL_ARGUMENT(2, "ILLEGAL_ARGUMENT"); private int code; private String msg; src/main/java/com/nq/controller/protol/UserPositionController.java
@@ -34,6 +34,15 @@ return this.iUserPositionService.findMyPositionByCodeAndSpell(stockCode, stockSpell, state, request, pageNum, pageSize,stockType); } //查询账户市值和持仓收益 @RequestMapping({"getMyPositionProfitAndLose.do"}) @ResponseBody public ServerResponse getMyPositionProfitAndLose(HttpServletRequest request ) { return this.iUserPositionService.getMyPositionProfitAndLose(request); } //根据股票代码查询用户最早入仓股票 @RequestMapping({"findUserPositionByCode.do"}) @ResponseBody src/main/java/com/nq/service/IUserPositionService.java
@@ -87,4 +87,6 @@ void stockConstraint(List<UserPosition> userPositions); ServerResponse getDzOrderList(int pageNum, int pageSize, Integer status, HttpServletRequest request); ServerResponse getMyPositionProfitAndLose(HttpServletRequest request); } src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.nq.common.CmcPayConfig; import com.nq.common.ResponseCode; import com.nq.common.ServerResponse; import com.nq.dao.*; import com.nq.enums.EStockType; @@ -94,7 +95,7 @@ if(ObjectUtils.isEmpty(user)){ GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil(); String lang = request.getHeader("lang"); return ServerResponse.createByErrorCodeMsg(401,googleTranslateUtil.translate("请登录",lang )); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),googleTranslateUtil.translate("请登录",lang )); } if(type == 1){//支付1 src/main/java/com/nq/service/impl/StockAiServiceImpl.java
@@ -4,6 +4,7 @@ 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; import com.nq.dao.StockAiOrderMapper; @@ -80,7 +81,7 @@ try { User user = iUserService.getCurrentUser(request); if (user == null ){ return ServerResponse.createByErrorCodeMsg(401,"请先登录"); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } Object lock = locks.computeIfAbsent(Long.valueOf(user.getId()), k -> new Object()); synchronized (lock){ @@ -160,7 +161,7 @@ try { User user = iUserService.getCurrentUser(request); if (user == null ){ return ServerResponse.createByErrorCodeMsg(401,"请先登录"); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } PageHelper.startPage(pageNum, pageSize); List<StockAiOrderTypeVO> stockAIOrders = stockAiOrderMapper.getStockAiOrderList(user.getId(), status); src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nq.common.ResponseCode; import com.nq.dao.*; import com.nq.enums.EConfigKey; import com.nq.enums.EStockType; @@ -36,6 +37,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneId; @@ -1843,7 +1845,7 @@ try { User user = iUserService.getCurrentUser(request); if (user == null ){ return ServerResponse.createByErrorCodeMsg(401,"请先登录"); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } PageHelper.startPage(pageNum, pageSize); List<UserPositionCheckDz> userPositionCheckDzs = userPositionCheckDzService.list( @@ -2002,6 +2004,84 @@ log.info("强制平仓成功，订单id: {}", position.getId()); } /** * 查询账户市值和持仓收益 * @param request * @return */ public ServerResponse getMyPositionProfitAndLose(HttpServletRequest request) { try { User user = iUserService.getCurrentUser(request); if (user == null ){ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } Integer state = 0; //status 0 持仓 1 平仓 List<UserPosition> userPositions = userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), null, null, state, null); BigDecimal usMarketValue = BigDecimal.ZERO; //美股市值 BigDecimal mxMarketValue = BigDecimal.ZERO; //墨西哥股市值 BigDecimal usPositionEarnings = BigDecimal.ZERO; //美股持仓收益 BigDecimal mxPositionEarnings = BigDecimal.ZERO; //墨西哥持仓收益 BigDecimal usPositionEarningsParent = BigDecimal.ZERO; //美股持仓收益百分比 BigDecimal mxPositionEarningsParent = BigDecimal.ZERO; //墨西哥持仓收益百分比 if (userPositions.size() > 0) { for (UserPosition position : userPositions) { BigDecimal nowPrice; if(state == 0){ nowPrice = priceServices.getNowPrice(position.getStockCode()); }else{ nowPrice = position.getSellOrderPrice(); } UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice); userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever()))); StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>() .eq(StockSubscribe::getCode, userPositionVO.getStockCode())); if(position.getSellOrderId() == null){ if (null != stockSubscribe && DateUtil.date().before(stockSubscribe.getListDate())) { userPositionVO.setProfitAndLose(BigDecimal.ZERO); userPositionVO.setProfitAndLoseParent("0%"); userPositionVO.setIsListed(false); }else{ userPositionVO.setIsListed(true); userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever()))); } }else{ userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever()))); } if (position.getStockGid().equals(EStockType.US.getCode())) { usMarketValue = usMarketValue.add(nowPrice); usPositionEarnings = usPositionEarnings.add(userPositionVO.getProfitAndLose()); usPositionEarningsParent = usPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2()); } else if(position.getStockGid().equals(EStockType.MX.getCode())) { mxMarketValue = mxMarketValue.add(nowPrice); mxPositionEarnings = mxPositionEarnings.add(userPositionVO.getProfitAndLose()); mxPositionEarningsParent = mxPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2()); } } usPositionEarnings = usPositionEarnings.setScale(2, RoundingMode.DOWN); mxPositionEarnings = mxPositionEarnings.setScale(2, RoundingMode.DOWN); } Map<String, String> map = new HashMap<>(); map.put("usMarketValue", String.valueOf(usMarketValue)); //美股市值 map.put("usPositionEarnings", String.valueOf(usPositionEarnings)); //美股持仓收益 map.put("usPositionEarningsParent", usPositionEarningsParent + "%");//美股持仓收益率 map.put("mxMarketValue", String.valueOf(usPositionEarnings)); //墨西哥股市值 map.put("mxPositionEarnings", String.valueOf(mxPositionEarnings)); //墨西哥持仓收益 map.put("mxPositionEarningsParent", mxPositionEarningsParent + "%");//墨西哥持仓收益率 return ServerResponse.createBySuccess(map); } catch (Exception e) { log.error("IUserPositionService getMyPositionProfitAndLose error", e); } return ServerResponse.createByError(); } }
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.nq.common.ResponseCode; import com.nq.common.ServerResponse; import com.nq.dao.StockSubscribeMapper; import com.nq.dao.UserAssetsMapper; @@ -472,7 +473,7 @@ } return ServerResponse.createBySuccess(list); } return ServerResponse.createByErrorCodeMsg(401,"请先登录"); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } /** * 新股申购-用户提交金额 @@ -516,7 +517,7 @@ return ServerResponse.createByErrorMsg("新股认购订单不存在!",request); } } return ServerResponse.createByErrorCodeMsg(401,"请先登录"); return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录"); } /** * 新股申购-删除 src/main/java/com/nq/utils/UserPointUtil.java
@@ -52,7 +52,9 @@ PositionProfitVO positionProfitVO = getPositionProfitVO(position,nowPrice); BigDecimal ss = positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(),BigDecimal.ROUND_CEILING) .multiply(new BigDecimal(100)); userPositionVO.setProfitAndLoseParent(ss.setScale(2, BigDecimal.ROUND_DOWN)+"%"); ss = ss.setScale(2, BigDecimal.ROUND_DOWN); userPositionVO.setProfitAndLoseParent(ss+"%"); userPositionVO.setProfitAndLoseParent2(ss); userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose()); userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose()); if(StringUtil.isEmpty(userPositionVO.getSellOrderId())){ src/main/java/com/nq/vo/position/UserPositionVO.java
@@ -67,4 +67,9 @@ private BigDecimal amountToBeCovered = BigDecimal.ZERO; private Boolean isListed = true; /** * 盈亏百分点 * */ private BigDecimal profitAndLoseParent2; }
