绑定卡时设备有效期

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontStudentController.java

@@ -100,7 +100,7 @@ public class FrontStudentController extends BaseController {
 
     @ApiOperation("30 计划院校专业信息")
     @GetMapping("university/plan")
-    public AjaxResult getuniversityPlan(@ApiParam("专业") Long planId) {
+    public AjaxResult getUniversityPlan(@ApiParam("专业") Long planId) {
         AMarjorPlan mp = marjorPlanService.selectAMarjorPlanById(planId);
         LearnDirectedKnowledge cond = new LearnDirectedKnowledge();
         String groupName = StringUtils.trimToEmpty(mp.getMajorGroup());

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -19,6 +19,8 @@ import com.ruoyi.dz.service.IDzCardsService;
 import com.ruoyi.dz.service.IDzClassesService;
 import com.ruoyi.dz.service.IDzControlService;
 import com.ruoyi.dz.service.IDzSchoolService;
+import com.ruoyi.enums.CardDistributeStatus;
+import com.ruoyi.enums.CardStatus;
 import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -230,8 +232,9 @@ public class UserController extends BaseController {
         if(null == cards || !cards.getPassword().equals(password)) {
             return AjaxResult.error("卡号或密码不正确");
         }
-        //已绑定卡不能使用
-
+        if(!CardStatus.Paid.getVal().equals(cards.getStatus())) {
+            return AjaxResult.error("无效卡");
+        }
         return AjaxResult.success(cards);
     }
 }

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -25,6 +25,8 @@ import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+
 /**
  * 注册校验方法
  * 
@@ -137,6 +139,11 @@ public class SysRegisterService
             user.setRegStatus(UserRegStatus.User);
         } else {
             card.setEndYear(register.getEndYear());
+            try {
+                card.setOutDate(DateUtils.parseDate(register.getEndYear() + "-08-30", "yyyy-MM-dd"));
+            } catch (ParseException e) {
+                throw new RuntimeException("saveInfo 日期错误", e);
+            }
             card.setYear(register.getEndYear() - 3);
             card.setSchoolId(register.getSchoolId());
             card.setClassId(register.getClassId());