update

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MessageTypeEnum.java

@@ -16,7 +16,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_WITHDRAW_SUCCESS("SMS_WITHDRAW_SUCCESS", "提现成功"),
     SMS_MUSIC_GROUP_CLOSE("SMS_MUSIC_GROUP_CLOSE", "乐团关闭(关闭后)"),
 
-    STUDENT_SMS_PAYMENT_RESULT("STUDENT_SMS_PAYMENT_RESULT", "缴费结果"),
+    STUDENT_SMS_PAYMENT_SUCCESS("STUDENT_SMS_PAYMENT_RESULT", "缴费成功结果通知"),
+    STUDENT_SMS_PAYMENT_FAILED("STUDENT_SMS_PAYMENT_RESULT", "缴费失败结果通知"),
     STUDENT_PUSH_PAYMENT_RESULT("STUDENT_PUSH_PAYMENT_RESULT", "缴费结果"),
     STUDENT_PUSH_MUSIC_GROUP_CLOSE("STUDENT_PUSH_MUSIC_GROUP_CLOSE", "乐团关闭(确认后)"),
     STUDENT_PUSH_BASICS_SKILL_APPLY_MESSAGE("STUDENT_PUSH_BASICS_SKILL_APPLY_MESSAGE", "基础技能训练报名通知"),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -74,8 +74,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Autowired
     private MusicGroupQuitDao musicGroupQuitDao;
 
+//    @Autowired
+//    private StudentRegistrationService studentRegistrationService;
+
     @Autowired
-    private StudentRegistrationService studentRegistrationService;
+    private StudentRegistrationDao studentRegistrationDao;
 
     @Autowired
     private CourseScheduleDao courseScheduleDao;
@@ -146,7 +149,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             List<StudentRegistration> studentRegistrationList = new ArrayList<>();
             subjectRegisters.forEach(e -> {
                     //原来乐团的注册学生
-                List<StudentRegistration> musicGroupStudentRegistrationList = studentRegistrationService.findStudentListByIdList(e.getRegisterIdList());
+                List<StudentRegistration> musicGroupStudentRegistrationList = studentRegistrationDao.findStudentListByIdList(e.getRegisterIdList());
                 for (StudentRegistration studentRegistration : musicGroupStudentRegistrationList) {
                     studentRegistration.setId(null);
                     studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
@@ -163,7 +166,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     musicGroupSubjectPlan.setApplyStudentNum(e.getRegisterIdList().size());
                 }
             });
-            studentRegistrationService.batchInsert(studentRegistrationList);
+            studentRegistrationDao.batchInsert(studentRegistrationList);
         }
 
         // 保存乐团声部规划
@@ -358,6 +361,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             sysUserCashAccountDetailService.addCashAccountDetail(order.getUserId(), order.getActualAmount(), SysUserCashAccountDetailService.MUSIC_GROUP
                     + musicGroupId, "", PlatformCashAccountDetailTypeEnum.REFUNDS, null, DealStatusEnum.SUCCESS, "取消乐团");
         }
+        //获取当前乐团所有已报名学员
+        List<StudentRegistration> registrations = studentRegistrationDao.findClassGroupStu(musicGroupId, null);
+
         //记录建团日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"取消乐团",sysUser.getId(),""));
         return true;
@@ -482,7 +488,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 
                 // 判断乐器是否是租赁
-                StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+                StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
                 if (studentRegistration == null) {
                     throw new BizException("用户注册信息不存在");
                 }
@@ -490,7 +496,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.QUIT);
                 studentRegistration.setUpdateTime(date);
 
-                studentRegistrationService.update(studentRegistration);
+                studentRegistrationDao.update(studentRegistration);
 
                 Integer subjectId = studentRegistration.getActualSubjectId();
                 MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
@@ -533,15 +539,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         classGroupStudentMapperDao.deleteStudentByMusicGroupId(musicGroupId, userId);
 
         // 判断乐器是否是租赁
-        StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+        StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         if (studentRegistration == null) {
             throw new BizException("用户注册信息不存在");
         }
         // 退团
         studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.QUIT);
         studentRegistration.setUpdateTime(date);
-        
-        studentRegistrationService.update(studentRegistration);
+
+        studentRegistrationDao.update(studentRegistration);
 
         Integer subjectId = studentRegistration.getActualSubjectId();
         MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
@@ -892,7 +898,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         //给家长发送乐团基础训练课短信
         //获取所有乐团学员列表
-        List<StudentRegistration> students = studentRegistrationService.queryStudentByMusicGroupId(musicGroupId);
+        List<StudentRegistration> students = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
         //获取所有家长电话
         Set<String> parentsPhones = students.stream().map(StudentRegistration::getParentsPhone).collect(Collectors.toSet());
         //获取对应家长的用户编号

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -49,6 +49,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
     @Autowired
+    private SysMessageConfigDao sysMessageConfigDao;
+    @Autowired
+    private SysMessageService sysMessageService;
+    @Autowired
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private MusicGroupSubjectPlanDao musicGroupSubjectPlanDao;
@@ -67,10 +71,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
-    private SysMessageService sysMessageService;
-    @Autowired
-    private SysMessageConfigDao sysMessageConfigDao;
-    @Autowired
     private MusicGroupDao musicGroupDao;
 
     @Override
@@ -510,6 +510,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             musicGroupStudentFee.setSubjectId(studentRegistration.getActualSubjectId());
             musicGroupStudentFee.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
             musicGroupStudentFeeDao.insert(musicGroupStudentFee);
+            //发送缴费成功通知（短信 + push）
+            String content = sysMessageConfigDao.findContent(MessageTypeEnum.STUDENT_SMS_PAYMENT_SUCCESS.getCode());
+            content = MessageFormatter.arrayFormat(content,studentRegistration.getParentsName(),studentPaymentOrder.getActualAmount());
+            sysMessageService.sendMessage(MessageSenderPluginContext.MessageSender.YIMEI,studentPaymentOrder.getUserId(),"",
+                    content,studentRegistration.getUserId().toString(),nowDate,0,"");
+            //push
+            sysMessageService.sendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,studentPaymentOrder.getUserId(),"",
+                    content,studentRegistration.getUserId().toString(),nowDate,0,"");
         }
 
         //失败减去已收款金额
@@ -518,6 +526,15 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.FAilED)) {
             musicOneSubjectClassPlan.setPaidStudentNum(musicOneSubjectClassPlan.getPaidStudentNum() - 1);
             musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+            //发送缴费成功通知（短信 + push）
+            String content = sysMessageConfigDao.findContent(MessageTypeEnum.STUDENT_SMS_PAYMENT_FAILED.getCode());
+            String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL + studentRegistration.getMusicGroupId());
+            content = MessageFormatter.arrayFormat(content,studentApplyUrl);
+            sysMessageService.sendMessage(MessageSenderPluginContext.MessageSender.YIMEI,studentPaymentOrder.getUserId(),"",
+                    content,studentRegistration.getUserId().toString(),nowDate,0,"");
+            //push
+            sysMessageService.sendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,studentPaymentOrder.getUserId(),"",
+                    content,studentRegistration.getUserId().toString(),nowDate,0,"");
         }
 
         return studentPaymentOrder;

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -27,7 +27,6 @@
 		<result column="img_" property="img" />
 		<result column="director_user_id_" property="directorUserId" />
 		<result column="settlement_type_" property="settlementType" />
-		<result column="is_classroom_lessons_" property="isClassroomLessons" />
 		<result column="memo_" property="memo" />
 	</resultMap>
 

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -360,7 +360,11 @@
 
     <!-- 获取班级下的学生 -->
     <select id="findClassGroupStu" resultMap="StudentRegistration">
-        SELECT * FROM student_registration WHERE music_group_id_= #{musicGroupId} AND class_group_id_=#{classGroupId}
+        SELECT * FROM student_registration
+        WHERE music_group_id_= #{musicGroupId}
+        <if test="classGroupId != null">
+            AND class_group_id_=#{classGroupId}
+        </if>
     </select>
 
     <!-- 根据班级和userId查询学生信息-->

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -92,7 +92,6 @@ public class MusicGroupController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		queryInfo.setOrganId(sysUser.getOrganId());
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -33,8 +33,7 @@ public class TeacherController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('teacher/add')")
     public HttpResponseResult add(Teacher teacher) throws Exception {
-        teacherService.add(teacher);
-        return succeed();
+        return succeed(teacherService.add(teacher));
     }
 
     @ApiOperation(value = "分页查询教师列表")
@@ -45,7 +44,7 @@ public class TeacherController extends BaseController {
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-        queryInfo.setOrganId(sysUser.getOrganId());
+//        queryInfo.setOrganId(sysUser.getOrganId());
         return succeed(teacherService.queryPageDetail(queryInfo));
     }