Merge remote-tracking branch 'origin/origin_master' into origin_master

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRegistrationService.java

@@ -344,4 +344,12 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      */
     Boolean batchDelRegs(String musicGroupId,List<Integer> userIds);
 
+
+    /**
+     * 获取乐团学员剩余课程金额
+     * @param musicGroupId
+     * @return
+     */
+    List<StudentRegistration> getMusicGroupStuReBack(String musicGroupId);
+
 }

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

@@ -2756,6 +2756,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("乐团当前状态是{}，不能关闭", musicGroup.getStatus().getMsg());
         }
 
+        courseScheduleStudentPaymentService.updateCourseActualPrice(Arrays.asList(musicGroup.getId()), GroupType.MUSIC);
+
         //有进行中的课不能关闭乐团
         Integer underwayCourseNum = courseScheduleDao.getUnderwayCourseNum(musicGroup.getId(), GroupType.MUSIC, CourseStatusEnum.UNDERWAY);
         if(underwayCourseNum >0){

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

@@ -1633,4 +1633,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         }
         return true;
     }
+
+    @Override
+    public List<StudentRegistration> getMusicGroupStuReBack(String musicGroupId) {
+        courseScheduleStudentPaymentService.updateCourseActualPrice(Arrays.asList(musicGroupId), GroupType.MUSIC);
+        return this.findMusicGroupStudent(musicGroupId,null);
+    }
 }

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

@@ -186,7 +186,7 @@ public class StudentRegistrationController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('studentRegistration/del')")
     public HttpResponseResult<Boolean> del(Long id) {
         StudentRegistration studentRegistration = studentRegistrationService.get(id);
-        if(studentRegistration == null){
+        if (studentRegistration == null) {
             return failed("删除的报名信息不存在");
         }
         return succeed(studentRegistrationService.delReg(id));
@@ -197,7 +197,16 @@ public class StudentRegistrationController extends BaseController {
     @PostMapping("/batchDel")
     @PreAuthorize("@pcs.hasPermissions('studentRegistration/batchDel')")
     public HttpResponseResult<Boolean> batchDel(@RequestBody DelRegisterDto delRegisterDto) {
-        return succeed(studentRegistrationService.batchDelRegs(delRegisterDto.getMusicGroupId(),delRegisterDto.getUserIds()));
+        return succeed(studentRegistrationService.batchDelRegs(delRegisterDto.getMusicGroupId(), delRegisterDto.getUserIds()));
+    }
+
+
+    @ApiOperation(value = "获取乐团学生的退费信息")
+    @GetMapping("/getMusicGroupStuReBack")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/getMusicGroupStuReBack')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
+    public HttpResponseResult getMusicGroupStuReBack(String musicGroupId) {
+        return succeed(studentRegistrationService.getMusicGroupStuReBack(musicGroupId));
     }
 
 }