From 3645f391c51051f2a22d7f88cd0b8a9dc414a67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B3=95=E6=8B=8951246?= <719602854@qq.com> Date: Wed, 4 Jun 2025 20:24:57 +0800 Subject: [PATCH] 1 --- ...\345\207\206\350\200\203\350\257\201.docx" | Bin 19565 -> 19813 bytes .../impl/TbExamRegistrationServiceImpl.java | 9 +++++++++ .../impl/TbMemberOrderServiceImpl.java | 10 +++++----- .../mapper/hezhi/TbExamRegistrationMapper.xml | 8 ++++---- .../mapper/hezhi/TbStudyCenterMapper.xml | 1 + ruoyi-ui/src/views/hezhi/course/index.vue | 10 +++++----- .../src/views/hezhi/studyCenter/index.vue | 2 ++ 7 files changed, 26 insertions(+), 14 deletions(-) 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 GIT binary patch delta 9068 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 Sv!wDAP(2lF#Ak(n)%`EwoDRbP delta 8726 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 GsrV05i#i?v 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 23d8fe8..e0fe8d0 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 9ba84d1..521e4c0 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 cb7fcc5..94d55ca 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 a64b47b..a5c0f9b 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