diff --git "a/ruoyi-admin/src/main/resources/reportForm/\345\255\246\344\277\241\345\207\206\350\200\203\350\257\201.docx" "b/ruoyi-admin/src/main/resources/reportForm/\345\255\246\344\277\241\345\207\206\350\200\203\350\257\201.docx" index be31f44283233d8c0dc041726281a9bfd3297d25..6449c1172b30e94b4d075db8edd24174d0d33d08 100644 Binary files "a/ruoyi-admin/src/main/resources/reportForm/\345\255\246\344\277\241\345\207\206\350\200\203\350\257\201.docx" and "b/ruoyi-admin/src/main/resources/reportForm/\345\255\246\344\277\241\345\207\206\350\200\203\350\257\201.docx" differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamRegistrationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamRegistrationServiceImpl.java index 23d8fe86234b2cd8d6b4524d2c2b1392d54dca4f..e0fe8d086f30c258e36c00f05838892eb5982391 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamRegistrationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamRegistrationServiceImpl.java @@ -1269,6 +1269,15 @@ public class TbExamRegistrationServiceImpl implements ITbExamRegistrationService erreList.put(item.getContactInformation(), "生日格式有误，正确格式：1999-09-09"); continue; } + //校验手机号必须11位纯数字 + if(item.getContactInformation().length() != 11||!item.getContactInformation().matches("^[0-9]*$")){ + erreList.put(item.getContactInformation(), "手机号格式有误，应为11位纯数字"); + continue; + } + //校验身份证号必须18位 + if(item.getIdentityCard().length() != 18){ + erreList.put(item.getContactInformation(), "身份证号格式有误，应为18位"); + } TbExamRegistration tbExamRegistration = new TbExamRegistration(); BeanUtils.copyProperties(item, tbExamRegistration); //毕业证书有最多三张图，需要合并url diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbMemberOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbMemberOrderServiceImpl.java index 9ba84d120a70f962c2b5ed1f4061e0cf2712152b..521e4c0321651132252578aeba5e0e2485dbc8b3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbMemberOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbMemberOrderServiceImpl.java @@ -152,14 +152,14 @@ public class TbMemberOrderServiceImpl implements ITbMemberOrderService log.info("开始清理过期未支付报名订单，数量：{}，订单号列表：{}", orderNos.size(), orderNos); - // 2. 删除订单记录 - int deletedOrders = tbMemberOrderMapper.deleteMemberOrderByOrderNos(orderNos); - log.info("已删除订单记录数量：{}", deletedOrders); - - // 3.将考试报名信息的支付状态改为已取消 + // 2.将考试报名信息的支付状态改为已取消 int updateRegistrations = tbExamRegistrationMapper.updateTbExamRegistrationByOrderNos(orderNos); log.info("已取消考试报名订单数量：{}", updateRegistrations); + // 3. 删除订单记录 + int deletedOrders = tbMemberOrderMapper.deleteMemberOrderByOrderNos(orderNos); + log.info("已删除订单记录数量：{}", deletedOrders); + return deletedOrders; } diff --git a/ruoyi-system/src/main/resources/mapper/hezhi/TbExamRegistrationMapper.xml b/ruoyi-system/src/main/resources/mapper/hezhi/TbExamRegistrationMapper.xml index cb7fcc5ebc75fa139b5a84d059c0a13bb9dfb534..94d55caac84c5ae39053b5cdf033fcf008de0cbb 100644 --- a/ruoyi-system/src/main/resources/mapper/hezhi/TbExamRegistrationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/hezhi/TbExamRegistrationMapper.xml @@ -887,16 +887,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ter.is_pay AS isPay, ter.pay_type AS payType, CONVERT(IFNULL(te.name, ''), CHAR) AS examName, - ter.pay_price AS payPrice, + tmo.pay_price AS payPrice, CONVERT(IFNULL(ter.registration_batch, ''), CHAR) AS registrationBatch, CONVERT(IFNULL(DATE_FORMAT(teb.exam_start_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examStartTime, CONVERT(IFNULL(DATE_FORMAT(teb.exam_end_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examEndTime, CASE - WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 0 THEN '未支付' + WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 0 and tmo.order_id is not null THEN '未支付' WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = -1 THEN '已取消' - WHEN #{examStatus} is not null AND #{examStatus} = 1 THEN '已报名' + WHEN #{examStatus} is not null AND #{examStatus} = 1 and ter.is_pay = 1 and tmo.order_id is not null THEN '已报名' WHEN #{examStatus} is not null AND #{examStatus} = 2 THEN '待开考' WHEN #{examStatus} is not null AND #{examStatus} = 3 AND 1 > (select count(*) from tb_exam_simulate_info tesi where ter.exam_id = tesi.exam_id and tesi.member_user_id = ter.member_user_id) THEN '待开考' WHEN #{examStatus} is not null AND #{examStatus} = 3 AND 1 = (select count(*) from tb_exam_simulate_info tesi where ter.exam_id = tesi.exam_id and tesi.member_user_id = ter.member_user_id and tesi.complete_status=1) THEN '考试中' @@ -1094,7 +1094,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ter.pay_type AS payType, CONVERT(IFNULL(te.name, ''), CHAR) AS examName, - ter.pay_price AS payPrice, + tmo.pay_price AS payPrice, CONVERT(IFNULL(ter.registration_batch, ''), CHAR) AS registrationBatch, CONVERT(IFNULL(DATE_FORMAT(teb.exam_start_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examStartTime, CONVERT(IFNULL(DATE_FORMAT(teb.exam_end_time,'%Y-%m-%d %H:%i:%s'), ''), CHAR) AS examEndTime, diff --git a/ruoyi-system/src/main/resources/mapper/hezhi/TbStudyCenterMapper.xml b/ruoyi-system/src/main/resources/mapper/hezhi/TbStudyCenterMapper.xml index a64b47bdbf4bd84e465779a8b582bb6366590ad0..a5c0f9b32ad477760e138e07e5a055e5d9411f9a 100644 --- a/ruoyi-system/src/main/resources/mapper/hezhi/TbStudyCenterMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/hezhi/TbStudyCenterMapper.xml @@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and delete_by = #{deleteBy} and del_flag = #{delFlag} + order by study_center_id desc