Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/common/result/ResponseStatusEnum.java

@@ -39,6 +39,7 @@ public enum ResponseStatusEnum implements Code{
     SYSTEM_LOGIN_ERROR(558,false,"无效token"),
     PARAM_ERROR(560, false, "参数不能为空！"),
     GZH_ERROR(561, false, "设置失败，请先关联公众号！"),
+    NOT_PAY(994, false, "未缴费"),
     STUDENT_CAR_NUMBER_NOT_FOUNT(995, false, "学生身份证号不存在"),
     CAR_NUM_EXCEED(996, false, "预约车辆已超过上限，请更换日期后重试"),
     THIRD_API_ERROR(997, false, "第三方api请求失败"),

src/main/java/com/template/services/WelcomeStudentService.java

@@ -69,9 +69,9 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
     void updateCarNumber(String studentCard, String carNumber);
 
     /**
-     * 根据学生学号/录取号统计数量
-     * @param studentCard 学号/录取号
-     * @return 数量
+     * 根据身份证号获取学生信息
+     * @param studentCard 身份证号
+     * @return 学生信息
      */
-    int countByStudentCard(String studentCard);
+    WelcomeStudent getByStudentCard(String studentCard);
 }

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -217,9 +217,9 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
-    public int countByStudentCard(String studentCard) {
+    public WelcomeStudent getByStudentCard(String studentCard) {
         LambdaQueryWrapper<WelcomeStudent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeStudent::getCardId, studentCard);
-        return count(queryWrapper);
+        return getOne(queryWrapper);
     }
 }

src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -19,6 +19,7 @@ import com.template.component.ParkingFeeSystemComponent;
 import com.template.component.bo.AddVisitorCarBO;
 import com.template.mapper.WelcomeVisitorMapper;
 import com.template.model.pojo.WelcomeSetting;
+import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeVisitor;
 import com.template.model.query.WelcomeVisitorQuery;
 import com.template.model.request.WelcomeVisitorRequest;
@@ -63,8 +64,6 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         visitorRequest.setStudentCard(studentCard);
         checkBeforeAdd(visitorRequest);
 
-        // TODO 查询学生学费缴纳情况
-
         // 新增访客记录
         WelcomeVisitor visitor = new WelcomeVisitor();
         BeanUtils.copyProperties(visitorRequest, visitor);
@@ -148,11 +147,16 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
 
         // 校验身份证号是否存在
         String studentCard = visitorRequest.getStudentCard();
-        int existCount = studentService.countByStudentCard(studentCard);
-        if (existCount <= 0) {
+        WelcomeStudent student = studentService.getByStudentCard(studentCard);
+        if (ObjectUtil.isNull(student)) {
             throw new MyCustomException(ResponseStatusEnum.STUDENT_CAR_NUMBER_NOT_FOUNT);
         }
 
+        // 查询学生学费缴纳情况 1：已缴费
+        if (!Integer.valueOf(1).equals(student.getIsPay())) {
+            throw new MyCustomException(ResponseStatusEnum.NOT_PAY);
+        }
+
         // 查询当前用户是否已有访客记录
         LambdaQueryWrapper<WelcomeVisitor> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeVisitor::getStudentCard, studentCard);
@@ -161,8 +165,6 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
             throw new MyCustomException(ResponseStatusEnum.EXISTS);
         }
 
-        // TODO 查询学生学费缴纳情况
-
         // 校验车牌数量  4 固定写法
         WelcomeSetting setting = settingService.getManageById("4");
         int carNum;