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

 Conflicts:

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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkStudentDetailDto.java

@@ -64,15 +64,15 @@ public class CourseHomeworkStudentDetailDto {
 
     private String type;
 
-    @ApiModelProperty(value = "是否有会员",required = false)
-    private Integer hasMember;
+    @ApiModelProperty(value = "提交云教练的作业开关",required = false)
+    private Integer homeworkOpenFlag;
 
-    public Integer getHasMember() {
-        return hasMember;
+    public Integer getHomeworkOpenFlag() {
+        return homeworkOpenFlag;
     }
 
-    public void setHasMember(Integer hasMember) {
-        this.hasMember = hasMember;
+    public void setHomeworkOpenFlag(Integer homeworkOpenFlag) {
+        this.homeworkOpenFlag = homeworkOpenFlag;
     }
 
     public Integer getMusicScoreId() {

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

@@ -235,20 +235,21 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			currentCourseDetail.setCoursePlan(planList.get(courseNumNo - 1).getPlan());
 		}
 		//获取有会员的学员数
-		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
-		if(StringUtils.isEmpty(configValue)){
-			configValue = "0";
-		}
-		if(configValue.equals("0")){
-			currentCourseDetail.setMemberNum(0);
-		}else {
-			MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-			if(musicGroup != null){
-				currentCourseDetail.setCourseViewType(musicGroup.getCourseViewType());
-			}
-			List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseID);
-			currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
-		}
+//		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+//		if(StringUtils.isEmpty(configValue)){
+//			configValue = "0";
+//		}
+//		if(configValue.equals("0")){
+//			currentCourseDetail.setMemberNum(0);
+//		}else {
+//			CourseSchedule courseSchedule = courseScheduleDao.get(courseID);
+//			MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+//			if(musicGroup != null){
+//				currentCourseDetail.setCourseViewType(musicGroup.getCourseViewType());
+//			}
+//			List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseID);
+//			currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
+//		}
 		return currentCourseDetail;
     }
 

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

@@ -107,14 +107,17 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		if(StringUtils.isEmpty(configValue)){
 			configValue = "0";
 		}
-		if(configValue.equals("0")){
-			detail.setHasMember(0);
-		}else {
-			detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
-			detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
-			Student student = studentDao.get(extraExerciseReply.getUserId());
-			detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
-		}
+		detail.setHomeworkOpenFlag(Integer.parseInt(configValue));
+		detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
+		detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
+//		if(!configValue.equals("0")){
+//			detail.setHasMember(0);
+//		}else {
+//			detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
+//			detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
+//			Student student = studentDao.get(extraExerciseReply.getUserId());
+//			detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+//		}
 		return detail;
 	}
 

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

@@ -214,14 +214,15 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         if(StringUtils.isEmpty(configValue)){
             configValue = "0";
         }
-        if(configValue.equals("0")){
-            courseHomeworkStudentDetail.setMusicScoreId(null);
-            courseHomeworkStudentDetail.setMusicScoreName(null);
-            courseHomeworkStudentDetail.setHasMember(0);
-        }else {
-            Student student = studentDao.get(userId.intValue());
-            courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
-        }
+        courseHomeworkStudentDetail.setHomeworkOpenFlag(Integer.parseInt(configValue));
+//        if(configValue.equals("0")){
+//            courseHomeworkStudentDetail.setMusicScoreId(null);
+//            courseHomeworkStudentDetail.setMusicScoreName(null);
+//            courseHomeworkStudentDetail.setHasMember(0);
+//        }else {
+//            Student student = studentDao.get(userId.intValue());
+//            courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+//        }
         return courseHomeworkStudentDetail;
     }
 

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

@@ -913,18 +913,18 @@ public class StudentServeServiceImpl implements StudentServeService {
             return result;
         }
 
-        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
-        if(StringUtils.isEmpty(configValue)){
-            configValue = "0";
-        }
+//        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+//        if(StringUtils.isEmpty(configValue)){
+//            configValue = "0";
+//        }
         List<Integer> studentIds=new ArrayList<>();
         if(StringUtils.isNotBlank(studentIdsStr)){
-            if(configValue.equals("0")){
-                result.put("memberNum",0);
-            }else {
+//            if(configValue.equals("0")){
+//                result.put("memberNum",0);
+//            }else {
                 //获取有会员的学员数
-                result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
-            }
+//                result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
+//            }
             studentIds= Arrays.asList(studentIdsStr.split(",")).stream().map(id->Integer.valueOf(id)).collect(Collectors.toList());
         }
 
@@ -938,18 +938,18 @@ public class StudentServeServiceImpl implements StudentServeService {
                 result.put("isAssignHomework", 0);
                 return result;
             }
-            if(configValue.equals("0")){
-                result.put("memberNum",0);
-                result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
-            }else {
-                MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-                if(musicGroup != null){
-                    result.put("courseViewType", musicGroup.getCourseViewType());
-                }else if(result.get("memberNum") == null){
-                    Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-                    result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
-                }
-            }
+//            if(configValue.equals("0")){
+//                result.put("memberNum",0);
+//                result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
+//            }else {
+//                MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+//                if(musicGroup != null){
+//                    result.put("courseViewType", musicGroup.getCourseViewType());
+//                }else if(result.get("memberNum") == null){
+//                    Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+//                    result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
+//                }
+//            }
 
             localDate=LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);