zyy
2025-07-16 37c4b8d314a93ac866a7886b262346ff8810dc3e
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -238,8 +238,8 @@
            userPosition.setOrderStayDays(Integer.valueOf(0));
            userPosition.setOrderStayFee(BigDecimal.ZERO);
            userPositionMapper.insert(userPosition);
            iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
            iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
            iUserAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
            iUserAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
            return ServerResponse.createBySuccessMsg("下单成功", request);
        }
    }
@@ -357,10 +357,11 @@
        if(null == stock){
            return ServerResponse.createByErrorMsg("股票不存在,平仓失败", request);
        }
        UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
        /*UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
                .eq(UserAssets::getUserId, userPosition.getUserId())
                .eq(UserAssets::getAccectType, stock.getStockType())
        );
        );*/
        UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId(stock.getStockType(),  userPosition.getUserId());
        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
        }
@@ -2072,7 +2073,7 @@
            map.put("usPositionEarnings", String.valueOf(usPositionEarnings));  //美股持仓收益
            map.put("usPositionEarningsParent", usPositionEarningsParent + "%");//美股持仓收益率
            map.put("mxMarketValue", String.valueOf(usPositionEarnings));       //墨西哥股市值
            map.put("mxMarketValue", String.valueOf(mxMarketValue));       //墨西哥股市值
            map.put("mxPositionEarnings", String.valueOf(mxPositionEarnings));  //墨西哥持仓收益
            map.put("mxPositionEarningsParent", mxPositionEarningsParent + "%");//墨西哥持仓收益率
            return ServerResponse.createBySuccess(map);