1

zj

2024-10-23 47eba336f4bc59e3dd99ae513a745321afdf2c19

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

@@ -331,7 +331,7 @@
    @Transactional
    public ServerResponse sell(String positionSn, int doType, Integer number,HttpServletRequest request) {
        UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
        if(number <= 0 || number > userPosition.getOrderNum()){
        if(null == number || number <= 0 || number > userPosition.getOrderNum()){
            return ServerResponse.createByErrorMsg("请输入正确的平仓数", request);
        }
        // 手续费率
@@ -627,17 +627,17 @@
        List<UserPositionVO> userPositionVOS = Lists.newArrayList();
        if (userPositions.size() > 0) {
            for (UserPosition position : userPositions) {
                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.getLast());
                if(state == 0){
                    nowPrice = priceServices.getNowPrice(position.getStockCode());
                }else{
                    nowPrice = position.getSellOrderPrice();
                }
//                if(state == 1){
//                    nowPrice = position.getSellOrderPrice();
//                }else{
//                    nowPrice = priceServices.getNowPrice(position.getStockCode());
//                }
////                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())));

@@ -1701,10 +1701,14 @@
        if (stockDz.getStockNum() > num) {
            return ServerResponse.createByErrorMsg("最小购买数据" + stockDz.getStockNum(), request);
        }

        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 (buyAmt.compareTo(availableBalance) > 0) {
        if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
            return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
        }

@@ -1720,7 +1724,6 @@
        // 创建UserPosition对象
        UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
        userPositionMapper.insert(userPosition);
        BigDecimal siteSettingBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
        BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(buyAmt);
        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
        iUserAssetsServices.availablebalanceChange("IN", userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");