Merge branch 'system_fee_update' of http://git.dayaedu.com/yonge/mec

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

@@ -330,13 +330,14 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 				}
 				String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
 				String pushUrl = baseApiUrl + "/#/musicGroupRenew?calenderId=" + calender.getId() + "&id=" + musicGroupId;
+				String sortUrl = HttpUtil.getSortUrl(pushUrl);
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
 						MessageTypeEnum.SMS_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,
 						userMap,
 						null,
 						0,
-						HttpUtil.getSortUrl(pushUrl),
-						null,memberName,autoCreateMemberRenew,pushUrl);
+						sortUrl,
+						null,memberName,autoCreateMemberRenew,sortUrl);
 
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
 						MessageTypeEnum.PUSH_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRecordController.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -78,4 +77,10 @@ public class MusicGroupRecordController extends BaseController {
 		return succeed(model);
 	}
 
+	@ApiOperation(value = "学员列表")
+	@GetMapping("/queryStudentInfo")
+	public Object queryStudentInfo(MusicGroupRecordStudentQueryInfo queryInfo) {
+		return succeed(studentRegistrationService.queryStudentRegisterInstrumentsDetailList(queryInfo));
+	}
+
 }