From 4452191dcdda5573a6bd62c8cf5f96fae03b613b Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Thu, 1 Feb 2024 17:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E5=91=8A=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E5=88=86=E9=85=8D=E4=BC=98=E5=85=88=E7=BA=A7LP?= =?UTF-8?q?=E5=88=86=E9=85=8D=E7=8E=87=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?bug=EF=BC=8C=E9=80=80=E5=87=BA=E6=97=B6=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceImpl/InvestmentReportServiceImpl.java | 7 ++++--- .../service/serviceImpl/ProfitDistributionServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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(); //计算可用资金是否正确 基金募集总金额-投资金额+退出时投资收益