Merge remote-tracking branch 'origin/master'

src/main/java/com/sztzjy/fund_investment/controller/ContractInvestmentController.java

@@ -107,9 +107,9 @@ public class ContractInvestmentController {
     public ResultEntity<Double> 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);

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;
 }

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;
 }

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