update

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

@@ -104,14 +104,8 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         if(StringUtils.isEmpty(configValue)){
             throw new BizException("请配置会员团每学期赠送课程分钟数");
         }
-//        Integer giveCourseTime = Integer.parseInt(configValue)>>1;
-
-        //课程形态
-//        Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
-
         //乐团计划及收费信息
         MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
-
         //乐团乐器及辅件信息
         List<MusicGroupSubjectGoodsGroup> goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroup(musicGroupId, subjectId);
 
@@ -126,58 +120,16 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
                 goodsGroup.setChildGoodsList(goodsDao.findGoodsByIds(childGoodIds));
             }
         }
-
-
         //获取声部（科目）下其他商品
         MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
-//        musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
-//        musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         musicGroupSubjectGoodsAndInfo.setMusicGroup(musicGroup);
         //新的课程形态10.27
         MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.getMusicGroupRegCalender(musicGroupId);
         if (musicGroupRegCalender != null) {
-//            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
-//            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
             musicGroupSubjectGoodsAndInfo.setPaymentCalender(musicGroupPaymentCalenderService.getDetail(musicGroupRegCalender.getId()));
         }
-		/*if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCloudTeacherType() != null) {
-			// 历史数据
-			if (musicGroup.getCloudTeacherType() != null) {
-				OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
-				if (musicGroup.getCloudTeacherType() == 0) {
-					musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(cloudTeacherFee.getPrice());
-				} else if (musicGroup.getCloudTeacherType() == 1) {
-					musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(cloudTeacherFee.getPlusPrice());
-				}
-			} else {
-				musicGroupSubjectGoodsAndInfo.setCloudTeacherFee(musicGroupRegCalender.getMemberPaymentAmount());
-			}
-
-			if (musicGroupRegCalender != null && musicGroupRegCalender.getMemberRankSettingId() != null) {
-				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(musicGroupRegCalender
-						.getMemberRankSettingId()));
-			} else{
-				musicGroupSubjectGoodsAndInfo.setMemberPrivilegesItemList(memberRankPrivilegesService.queryByMemberRankId(1));
-			}
-			
-			Map<String, BigDecimal> memberCoursePrice = new HashMap<String, BigDecimal>();
-			
-			OrganizationCourseUnitPriceSettings singleUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.SINGLE, musicGroup.getChargeTypeId());
-			if (singleUnitPriceSettings != null) {
-				memberCoursePrice.put(CourseScheduleType.SINGLE.name(),
-						singleUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(giveCourseTime)).setScale(0, BigDecimal.ROUND_HALF_UP));
-			}
-			OrganizationCourseUnitPriceSettings mixUnitPriceSettings = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(musicGroup.getOrganId(), CourseScheduleType.MIX, musicGroup.getChargeTypeId());
-			if (mixUnitPriceSettings != null) {
-				memberCoursePrice.put(CourseScheduleType.MIX.name(),
-						mixUnitPriceSettings.getUnitPrice().multiply(new BigDecimal(giveCourseTime)).setScale(0, BigDecimal.ROUND_HALF_UP));
-			}
-			
-			musicGroupSubjectGoodsAndInfo.setMemberCoursePrice(memberCoursePrice);
-		}*/
-		
 		// 查询已购买内容
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser != null){

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

@@ -505,8 +505,6 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         // String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + studentRegistration.getMusicGroupId();
         String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
         Subject subject = subjectDao.get(studentRegistration.getSubjectId());
-        // MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
-
         Map<Integer, String> map = new HashMap<>(1);
         map.put(sysUser.getId(), studentRegistration.getParentsPhone());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "", "",

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

@@ -219,7 +219,7 @@ public class StudentRegistrationController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "subjectId", value = "声部信息", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public HttpResponseResult<MusicGroupSubjectGoodsAndInfoDto> getSubjectGoodsAndInfo(Integer subjectId, String musicGroupId, Long calenderId) {
-        if (subjectId == null || StringUtils.isEmpty(musicGroupId) || calenderId == null) {
+        if (subjectId == null || StringUtils.isEmpty(musicGroupId)) {
             return failed("参数校验异常");
         }
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);