|
|
@@ -90,7 +90,7 @@ public class MusicGroupQuitController extends BaseController {
|
|
|
}
|
|
|
List<Integer> userRole = employeeService.queryUserRole(sysUser.getId());
|
|
|
//如果当前用户只有教务老师角色，那么只能看到他所管理的课程组的信息
|
|
|
- if (userRole.size() == 1 && userRole.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
|
|
|
+ if (userRole.contains(SysUserRole.EDUCATIONAL_TEACHER) && !userRole.contains(SysUserRole.SECTION_MANAGER)) {
|
|
|
queryInfo.setEducationUserId(sysUser.getId());
|
|
|
}
|
|
|
PageInfo<MusicGroupQuit> musicGroupQuitPageInfo = musicGroupQuitService.queryPage(queryInfo);
|
|
|
@@ -163,6 +163,30 @@ public class MusicGroupQuitController extends BaseController {
|
|
|
|
|
|
return succeed(musicGroupQuit);
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation(value = "查询退费明细")
|
|
|
+ @GetMapping("/queryRefundsDetail")
|
|
|
+ @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/queryRefundsDetail')")
|
|
|
+ public HttpResponseResult queryRefundsDetail(Integer userId, String musicGroupId) throws Exception {
|
|
|
+ Map<String, BigDecimal> map = studentRegistrationService.queryRefundsDetail(userId, musicGroupId);
|
|
|
+ MusicGroupReturnFeeDto dto = new MusicGroupReturnFeeDto();
|
|
|
+ dto.setIsReturnAccessoriesFee(false);
|
|
|
+ dto.setAccessoriesFee(map.get(OrderDetailTypeEnum.ACCESSORIES.getCode()));
|
|
|
+
|
|
|
+ dto.setIsReturnCourseFee(false);
|
|
|
+ dto.setCourseFee(map.get(OrderDetailTypeEnum.COURSE.getCode()));
|
|
|
+
|
|
|
+ dto.setIsReturnMaintenanceFee(false);
|
|
|
+ dto.setMaintenanceFee(map.get(OrderDetailTypeEnum.MAINTENANCE.getCode()));
|
|
|
+
|
|
|
+ dto.setIsReturnMemberFee(false);
|
|
|
+ dto.setMemberFee(map.get(OrderDetailTypeEnum.CLOUD_TEACHER.getCode()));
|
|
|
+
|
|
|
+ dto.setIsReturnMusicalFee(false);
|
|
|
+ dto.setMusicalFee(map.get(OrderDetailTypeEnum.MUSICAL.getCode()));
|
|
|
+
|
|
|
+ return succeed(dto);
|
|
|
+ }
|
|
|
|
|
|
@ApiOperation(value = "申请退团")
|
|
|
@PostMapping("/apply")
|
yonge