diff --git a/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java b/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java index 0d72503..fe92513 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java @@ -150,6 +150,7 @@ public class ContractInvestmentController { //更新操作 item.setShareRatio(BigDecimal.valueOf(proportion)); item.setInvestmentAmount(BigDecimal.valueOf(totalInvest)); + item.setShareCount(BigDecimal.valueOf(totalInvest)); profitManagementMapper.updateByPrimaryKeySelective(item); }); } else { diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ContractInvestmentServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ContractInvestmentServiceImpl.java index a2d52d7..f3f156b 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ContractInvestmentServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ContractInvestmentServiceImpl.java @@ -260,10 +260,12 @@ public class ContractInvestmentServiceImpl implements ContractInvestmentService investmentAgreementDto.setTotalAmountOfCapitalIncrease(investmentAmount.doubleValue()); //第三条新公司持有的股份 investmentAgreementDto.setSharesHeld(String.valueOf(investmentAmount)); + //第三条占新公司总股本百分比 Double aDouble20 = Convert.toDouble(profitManagement.getShareRatio()); - Double aDouble205 = aDouble20*100; - investmentAgreementDto.setOwnShare(aDouble205.toString()); + + + investmentAgreementDto.setOwnShare(aDouble20.toString()); //第三条4.0进入新公司股本金额 investmentAgreementDto.setAmountMoney(String.valueOf(investmentAmount)); @@ -277,15 +279,9 @@ public class ContractInvestmentServiceImpl implements ContractInvestmentService investmentAgreementDto.setSigningAddress(businessInfoList.get(0).getRegisteredAddress()); - - return investmentAgreementDto; - - - - } return null;