增加检查小学报名年龄是否满6岁。

common/pom.xml

@@ -198,7 +198,6 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
             <version>1.46</version>
-            <scope>provided</scope>
         </dependency>
 
         <!--rabbmitmq-->

web/pom.xml

@@ -99,6 +99,12 @@
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
             <version>${alipay.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--支付相关 end-->
         <dependency>

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/PrimarySchoolApiController.java

@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -278,7 +280,9 @@ public class PrimarySchoolApiController {
 
     @PostMapping("validateIdCard")
     @ApiOperation(value = "验证身份证")
-    public MessageResult<String> validateIdCard(String applicationId,String idCard,@RequestAttribute String subject){
+    public MessageResult<String> validateIdCard(String applicationId,String idCard,
+                                                String birthday,
+                                                @RequestAttribute String subject){
         MessageResult<String> messageResult = new MessageResult<>();
 
         try {
@@ -288,6 +292,21 @@ public class PrimarySchoolApiController {
                 throw new Exception("身份证无效!");
             }
 
+//            DateTime birthDate = new DateTime(cic.getBirthDate());
+//
+//            if (!birthDate.toString("yyyy-MM-dd").equals(birthday)) {
+//                throw new Exception("身份证号中出生年月与实际填写出生年月不符!");
+//            }
+
+            if (StringUtils.isNotEmpty(birthday)){
+                //todo 增加检查学生是否满6岁
+                DateTime startTime = DateTime.parse(birthday, DateTimeFormat.forPattern("yyyy-MM-dd"));
+                DateTime endTime = DateTime.parse(DateTime.now().getYear() + "-09-01", DateTimeFormat.forPattern("yyyy-MM-dd"));
+
+                if (startTime.compareTo(endTime.minusYears(6))>=0){
+                    throw new Exception("学生未满6岁不能报名!");
+                }
+            }
 
             //todo 根据身份证查询当前学生是否已报名
             boolean exist = applicationPrimaryService.existByIdCard(idCard,applicationId);

web/src/test/java/com/jpsoft/campus/ApplicationPrimaryTest.java

@@ -7,6 +7,8 @@ import com.jpsoft.campus.modules.base.dto.ApplicationPrimaryDTO;
 import com.jpsoft.campus.modules.base.dto.AttachmentDTO;
 import com.jpsoft.campus.modules.common.dto.MessageResult;
 import com.jpsoft.campus.modules.mobile.controller.PrimarySchoolApiController;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

web/src/test/java/com/jpsoft/campus/BirthdayTest.java

@@ -0,0 +1,21 @@
+package com.jpsoft.campus;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+
+public class BirthdayTest {
+    public static void main(String[] args){
+        String birthday = "2014-09-01";
+
+        //todo 增加检查学生是否满6岁
+        DateTime startTime = DateTime.parse(birthday, DateTimeFormat.forPattern("yyyy-MM-dd"));
+        DateTime endTime = DateTime.parse(DateTime.now().getYear() + "-09-01", DateTimeFormat.forPattern("yyyy-MM-dd"));
+
+        if (startTime.compareTo(endTime.minusYears(6))>=0){
+            System.out.println("学生未满6岁不能报名!");
+        }
+        else{
+            System.out.println("已满6岁!");
+        }
+    }
+}