1

zj

2024-10-10 cc18ca14afec7ac0db2be2a1cd31657de497884b

1

 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java

@@ -15,6 +15,7 @@
import com.google.common.collect.Lists;
import com.nq.common.ServerResponse;
import com.nq.utils.*;
import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.stock.BuyAndSellUtils;
import com.nq.utils.stock.GeneratePosition;
import com.nq.utils.stock.GetStayDays;
@@ -626,7 +627,18 @@
        List<UserPositionVO> userPositionVOS = Lists.newArrayList();
        if (userPositions.size() > 0) {
            for (UserPosition position : userPositions) {
                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position, priceServices.getNowPrice(position.getStockCode()));
                Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",position.getStockCode()));
                BigDecimal nowPrice = BigDecimal.ZERO;
                if(null != stock){
                    StockRealTimeBean stockRealTimeBean =  RedisKeyUtil.getCacheRealTimeStock(stock);
                    nowPrice = new BigDecimal(stockRealTimeBean.getPcp());
                }
//                if(state == 1){
//                    nowPrice = position.getSellOrderPrice();
//                }else{
//                    nowPrice = priceServices.getNowPrice(position.getStockCode());
//                }
                UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);
                userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));

                StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new LambdaQueryWrapper<StockSubscribe>()

 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java

@@ -353,9 +353,20 @@
            return ServerResponse.createByErrorMsg("用户资金账户不存在");
        }
        if (state == 3) {

            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
            userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                BigDecimal subtract = userWithdraw.getWithAmt().subtract(userAssets.getAmountToBeCovered());
                if(subtract.compareTo(BigDecimal.ZERO) > 0){
                    userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
                    userAssets.setAmountToBeCovered(BigDecimal.ZERO);
                }else{
                    userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
                    userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userWithdraw.getWithAmt()));
                }
            }else{
                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
                userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
            }
            int updateCount = userAssetsMapper.updateById(userAssets);
            if (updateCount > 0) {
                log.info("提现失败，返还用户资金成功！");