diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InvestmentReportServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InvestmentReportServiceImpl.java index 160961b..1244df2 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InvestmentReportServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InvestmentReportServiceImpl.java @@ -56,9 +56,10 @@ public class InvestmentReportServiceImpl implements InvestmentReportService { //只允许提交一次,判断是否只提交了心得没提交报告 if (!trainingReports.isEmpty()) { TrainingReport trainingReport = trainingReports.get(0); - if (StringUtils.isNotBlank(trainingReport.getReportName()) && StringUtils.isNotBlank(trainingReport.getUrl())) { - return new ResultEntity<>(HttpStatus.BAD_REQUEST, "不允许重复提交!"); - } else { + if (StringUtils.isNotBlank(trainingReport.getExperience())) { + return new ResultEntity<>(HttpStatus.BAD_REQUEST, "提交后不允许再上传报告!"); + } + else { trainingReport.setUrl(filePath); trainingReport.setReportName(fileName); trainingReport.setUploadtime(new Date()); diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java index 9dab20d..6bca76f 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java @@ -175,8 +175,8 @@ public class ProfitDistributionServiceImpl implements ProfitDistributionService BigDecimal exitFundEarnings = exitTime.getExitFundEarnings();//投资收益 BigDecimal userRoundOwnFunds = profitDistribution.getUserRoundOwnFunds();//用户/第一轮自有资金 BigDecimal userRoundPreferredLp = profitDistribution.getUserRoundPreferredLp(); //用户/第一轮优先级LP - BigDecimal userRemainingOwnFunds = profitDistribution.getRemainingOwnFunds();//用户/第二轮自有资金 - BigDecimal userRemainingEarningsPreferredLp = profitDistribution.getRemainingEarningsPreferredLp();//用户/第二轮优先级LP + BigDecimal userRemainingOwnFunds = profitDistribution.getUserRemainingOwnFunds();//用户/第二轮自有资金 + BigDecimal userRemainingEarningsPreferredLp = profitDistribution.getUserRemainingEarningsPreferredLp();//用户/第二轮优先级LP BigDecimal rightOwnFunds = fundraising.getOwnFunds();//正确/第一轮自有资金 Integer type = fundraising.getType(); //计算可用资金是否正确 基金募集总金额-投资金额+退出时投资收益