修改

zyy

2025-07-16 5a766206055d0268e051e44d9b8b39d411142426

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

@@ -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);