Merge remote-tracking branch 'origin/master'

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

@@ -88,7 +88,7 @@ public class MusicGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "subjectId", value = "声部编号", required = true, dataType = "Integer")})
     public HttpResponseResult getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        //SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
         return succeed(subjectGoodsAndInfo);
     }
@@ -136,9 +136,17 @@ public class MusicGroupController extends BaseController {
 		if (amount == null || amount.doubleValue() == 0) {
 			amount = musicGroupStudentFee.getCourseFee();
 		}
+
+		StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+		if (studentRegistration == null) {
+			return failed("乐团报名信息找不到");
+		}
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId,
+				studentRegistration.getActualSubjectId());
 		ModelMap model = new ModelMap();
 		model.put("musicGroup", musicGroup);
 		model.put("amount", amount);
+		model.put("musicGroupSubjectPlan", musicGroupSubjectPlan);
 
 		return succeed(model);
 	}