From c44c63a4e8c4e586b9a3a64940996d325710fade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 30 Jan 2026 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?1.BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/hezhi/domain/TbMemberScore.java | 3 ++ .../hezhi/mapper/TbMemberScoreMapper.java | 8 +++ .../impl/TbExamSubjectServiceImpl.java | 29 ++++++----- .../service/impl/TbStudentServiceImpl.java | 5 +- .../mapper/hezhi/TbMemberScoreMapper.xml | 6 +++ .../src/layout/components/Sidebar/Logo.vue | 2 +- .../src/views/hezhi/liveBroadcast/index.vue | 52 +++++++++++++++++-- ruoyi-ui/src/views/hezhi/notice/index.vue | 6 +-- ruoyi-ui/src/views/login.vue | 1 + 9 files changed, 89 insertions(+), 23 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMemberScore.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMemberScore.java index 986da34..1467a8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMemberScore.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMemberScore.java @@ -42,6 +42,9 @@ public class TbMemberScore extends BaseEntity @Excel(name = "类型") private Integer type; + // 学员ID + private Long studentId; + /** 收入支出（0-无，1-收入，2-支出） */ @Excel(name = "收入支出", readConverterExp = "1=-收入，2-支出") private Integer incomeExpenses; diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbMemberScoreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbMemberScoreMapper.java index 8d6dcf6..67f3095 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbMemberScoreMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/mapper/TbMemberScoreMapper.java @@ -62,6 +62,14 @@ public interface TbMemberScoreMapper */ public int deleteTbMemberScoreByMemberScoreIds(Long[] memberScoreIds); + /** + * 批量删除用户积分详情 + * + * @param studentIds 需要删除的学员ID集合 + * @return 结果 + */ + public int deleteTbMemberScoreByStudentId(Long[] studentIds); + /** * 我的积分列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamSubjectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamSubjectServiceImpl.java index 4339820..c223974 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamSubjectServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbExamSubjectServiceImpl.java @@ -143,21 +143,22 @@ public class TbExamSubjectServiceImpl implements ITbExamSubjectService { */ @Override public int deleteTbExamSubjectByExamSubjectIds(Long[] examSubjectIds) { + // 没看明白这段校验是什么意思，表结构混乱！ //查看该题目是否绑定考试，如果有则不能删除 - StringBuilder stringBuilder = new StringBuilder("考试题目编号为：");//这全部只是考虑了正式考试，模拟考试没有考虑 - boolean flag = true; - for (Long examSubjectId : examSubjectIds) { - TbExamSubjectFormal params = new TbExamSubjectFormal(); - params.setExamSubjectId(examSubjectId);//根据考试题目编号查询 正式考试题目对象 - List tbExamSubjectFormals = tbExamSubjectFormalMapper.selectTbExamSubjectFormalList(params); - if (ObjectUtils.isNotEmpty(tbExamSubjectFormals)) { - stringBuilder.append(examSubjectId).append(","); - flag = false; - } - } - if (!flag){ - throw new ServiceException(stringBuilder +"已绑定考试，不能删除"); - } +// StringBuilder stringBuilder = new StringBuilder("考试题目编号为：");//这全部只是考虑了正式考试，模拟考试没有考虑 +// boolean flag = true; +// for (Long examSubjectId : examSubjectIds) { +// TbExamSubjectFormal params = new TbExamSubjectFormal(); +// params.setExamSubjectId(examSubjectId);//根据考试题目编号查询 正式考试题目对象 +// List tbExamSubjectFormals = tbExamSubjectFormalMapper.selectTbExamSubjectFormalList(params); +// if (ObjectUtils.isNotEmpty(tbExamSubjectFormals)) { +// stringBuilder.append(examSubjectId).append(","); +// flag = false; +// } +// } +// if (!flag){ +// throw new ServiceException(stringBuilder +"已绑定考试，不能删除"); +// } return tbExamSubjectMapper.deleteTbExamSubjectByExamSubjectIds(examSubjectIds); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbStudentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbStudentServiceImpl.java index a8a40b7..5106b28 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbStudentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbStudentServiceImpl.java @@ -307,8 +307,10 @@ public class TbStudentServiceImpl implements ITbStudentService { * @param studentIds 需要删除的学员主键 * @return 结果 */ + @Transactional(rollbackFor = Exception.class) @Override public int deleteTbStudentByStudentIds(Long[] studentIds) { + tbMemberScoreMapper.deleteTbMemberScoreByStudentId(studentIds); return tbStudentMapper.deleteTbStudentByStudentIds(studentIds); } @@ -678,7 +680,7 @@ public class TbStudentServiceImpl implements ITbStudentService { student.setOpenId(openId); student.setPhone(phoneNumber); student.setUnionId(unionId); - + student.setParentId(higherUserId); student.setSex(0); student.setUnionId(unionId); student.setStudentNumber(IdUtils.fastSimpleUUID()); @@ -707,6 +709,7 @@ public class TbStudentServiceImpl implements ITbStudentService { memberScore.setName("邀请用户赠送积分"); memberScore.setScore(score); memberScore.setType(2); + memberScore.setStudentId(student.getStudentId()); memberScore.setIncomeExpenses(1); memberScore.setCreateTime(DateUtils.getNowDate()); tbMemberScoreMapper.insertTbMemberScore(memberScore); diff --git a/ruoyi-system/src/main/resources/mapper/hezhi/TbMemberScoreMapper.xml b/ruoyi-system/src/main/resources/mapper/hezhi/TbMemberScoreMapper.xml index 48950a4..090cb43 100644 --- a/ruoyi-system/src/main/resources/mapper/hezhi/TbMemberScoreMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/hezhi/TbMemberScoreMapper.xml @@ -147,6 +147,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{memberScoreId} + + delete from tb_member_score where student_id in + + #{studentId} + +