From 64ffe49eddb602898a0b90e1238351fe96573d6f Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Wed, 26 Jun 2024 15:38:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E8=B5=84?= =?UTF-8?q?=E6=84=8F=E5=90=91=E4=B9=A6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ContractInvestmentController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 b8793d1..a5d2ee6 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java @@ -107,9 +107,9 @@ public class ContractInvestmentController { public ResultEntity totalInvestAmount(@ApiParam("流程ID") @RequestParam String flowId, @ApiParam("总投资额度") @RequestParam Double totalInvest) { //金额不低于100万 - if (1000000 > totalInvest) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "金额不能低于100万"); - } +// if (1000000 > totalInvest) { +// return new ResultEntity(HttpStatus.BAD_REQUEST, "金额不能低于100万"); +// } //查询估值 FoundProjectExample foundProjectExample = new FoundProjectExample(); @@ -136,9 +136,9 @@ public class ContractInvestmentController { // 金额不低于100万，持股比例自动显示，为总投资额/估值，持股比例不低于5% double proportion = (totalInvest / v)*100; - if (0.05 > proportion) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "持股比例不低于5%"); - } +// if (0.05 > proportion) { +// return new ResultEntity(HttpStatus.BAD_REQUEST, "持股比例不低于5%"); +// } ProfitManagementExample profitManagementExample = new ProfitManagementExample(); profitManagementExample.createCriteria().andFlowIdEqualTo(flowId); From be72196c486f0b51852f7431d4f16c6b51905f55 Mon Sep 17 00:00:00 2001 From: "@t2652009480" <2652009480@qq.com> Date: Wed, 26 Jun 2024 16:45:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8F=91=E8=A1=8C--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E4=BB=B7=E5=9B=9E=E6=98=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/dto/InquiryParticipationDTO.java | 6 ++++++ .../service/serviceImpl/InquiryIssuanceServiceImpl.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/sztzjy/fund_investment/entity/dto/InquiryParticipationDTO.java b/src/main/java/com/sztzjy/fund_investment/entity/dto/InquiryParticipationDTO.java index 82ef9bf..c48e33c 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/dto/InquiryParticipationDTO.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/dto/InquiryParticipationDTO.java @@ -19,4 +19,10 @@ public class InquiryParticipationDTO { private String custodianSeat; @ApiModelProperty("申报价格") private BigDecimal declarationPrice; + @ApiModelProperty("最低申购量(万股)") + private BigDecimal minimumSubscriptionVolume; + @ApiModelProperty("申购量变动最小单位(万股)") + private BigDecimal minimumSubscriptionVolumeChangeUnit; + @ApiModelProperty("最高由购量(万股)") + private BigDecimal maximumSubscriptionQuantity; } diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java index 6f0e95e..0a82c6e 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java @@ -322,11 +322,19 @@ public class InquiryIssuanceServiceImpl implements InquiryIssuanceService { //取到证券账户和托管席位 String remainingShareRegistrationAccountShenzhen = issuanceInfos.get(0).getRemainingShareRegistrationAccountShenzhen(); String remainingShareCustodianSeatShenzhen = issuanceInfos.get(0).getRemainingShareCustodianSeatShenzhen(); + + //取到最高、最低申购量、最小变动量 + BigDecimal minimumSubscriptionVolume = issuanceInfos.get(0).getMinimumSubscriptionVolume(); + BigDecimal maximumSubscriptionQuantity = issuanceInfos.get(0).getMaximumSubscriptionQuantity(); + BigDecimal minimumSubscriptionVolumeChangeUnit = issuanceInfos.get(0).getMinimumSubscriptionVolumeChangeUnit(); //赋值到InquiryParticipationDTO InquiryParticipationDTO inquiryParticipationDTO=new InquiryParticipationDTO(); inquiryParticipationDTO.setAllotmentObjectName("皖西基金管理有限公司"); inquiryParticipationDTO.setSecuritiesAccount(remainingShareRegistrationAccountShenzhen); inquiryParticipationDTO.setCustodianSeat(remainingShareCustodianSeatShenzhen); + inquiryParticipationDTO.setMinimumSubscriptionVolume(minimumSubscriptionVolume); + inquiryParticipationDTO.setMaximumSubscriptionQuantity(maximumSubscriptionQuantity); + inquiryParticipationDTO.setMinimumSubscriptionVolumeChangeUnit(minimumSubscriptionVolumeChangeUnit); //取到申报价格 InquiryParticipation inquiryParticipation = inquiryParticipationMapper.selectByPrimaryKey(id); inquiryParticipationDTO.setDeclarationPrice(inquiryParticipation.getDeclarationPrice()); From 262b483427207cc7169738465c2c1f130f65c951 Mon Sep 17 00:00:00 2001 From: "@t2652009480" <2652009480@qq.com> Date: Wed, 26 Jun 2024 17:55:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=A2=E4=BB=B7=E5=8F=91=E8=A1=8C--?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E4=BB=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sztzjy/fund_investment/entity/dto/QuotationDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationDTO.java b/src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationDTO.java index fde2ca6..2a415f7 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationDTO.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationDTO.java @@ -15,4 +15,10 @@ public class QuotationDTO { private BigDecimal declarationPrice; @ApiModelProperty("拟申购数量(万股)") private BigDecimal intendedSubscriptionQuantity; + @ApiModelProperty("最低申购量(万股)") + private BigDecimal minimumSubscriptionVolume; + @ApiModelProperty("申购量变动最小单位(万股)") + private BigDecimal minimumSubscriptionVolumeChangeUnit; + @ApiModelProperty("最高由购量(万股)") + private BigDecimal maximumSubscriptionQuantity; }