Pārlūkot izejas kodu

系统收费作业开关

zouxuan 4 gadi atpakaļ
vecāks
revīzija
9b7b834648

+ 2 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -222,11 +222,10 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //会员结束前5天提醒学员续费(退团提醒)(默认提前5天)
     String PUSH_MEMBER_RENEW_QUIT = "push_member_renew_quit";
 
-    //会员结束后3天学员自动退团
-    String MEMBER_END_AUTO_QUIT_MUSIC = "member_end_auto_quit_music";
-
     String CHILDREN_DAY_VIP_ACTIVITY_IDS = "children_day_vip_activity_ids";
 
+    String HOMEWORK_OPEN_FLAG = "homework_open_flag";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -232,7 +232,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         currentCourseDetail.setAdvanceSignOutMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_OUT_MINUTES)));
 		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 {
+			currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
+		}
 		return currentCourseDetail;
     }
 

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.StudentServeService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -52,6 +53,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Autowired
 	private StudentDao studentDao;
 	@Autowired
+	private SysConfigDao sysConfigDao;
+	@Autowired
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
 	private StudentServeService studentServeService;
@@ -102,8 +105,16 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setStudentName(extraExerciseReply.getStudentName());
 		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		detail.setType("EXTRA");
-		Student student = studentDao.get(extraExerciseReply.getUserId());
-		detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+		if(StringUtils.isEmpty(configValue)){
+			configValue = "0";
+		}
+		if(configValue.equals("0")){
+			detail.setHasMember(0);
+		}else {
+			Student student = studentDao.get(extraExerciseReply.getUserId());
+			detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+		}
 		detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
 		detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
 		return detail;

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

@@ -72,6 +72,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     private PracticeGroupDao practiceGroupDao;
     @Autowired
     private ExtracurricularExercisesReplyDao extracurricularExercisesReplyDao;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @Override
     public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -208,8 +210,16 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             }
         }
         courseHomeworkStudentDetail.setType("HOMEWORK");
-        Student student = studentDao.get(userId.intValue());
-        courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+        if(StringUtils.isEmpty(configValue)){
+            configValue = "0";
+        }
+        if(configValue.equals("0")){
+            courseHomeworkStudentDetail.setHasMember(0);
+        }else {
+            Student student = studentDao.get(userId.intValue());
+            courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+        }
         return courseHomeworkStudentDetail;
     }
 

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

@@ -45,7 +45,7 @@ public class StudentServeServiceImpl implements StudentServeService {
     @Autowired
     private StudentServeService studentServeService;
     @Autowired
-    private SysConfigService sysConfigService;
+    private SysConfigDao sysConfigDao;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
     @Autowired
@@ -311,9 +311,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         Date nextMonday = Date.from(sunDayDate.plusDays(1).atStartOfDay(DateUtil.zoneId).toInstant());
 
         Set<String> holidayDays = new HashSet<>();
-        SysConfig holidaySetting = sysConfigService.findByParamName(SysConfigService.HOLIDAY_SETTING);
-        if(Objects.nonNull(holidaySetting)&&StringUtils.isNotBlank(holidaySetting.getParanValue())){
-            holidayDays = new HashSet<>(JSON.parseArray(holidaySetting.getParanValue(), String.class));
+        String holidaySetting = sysConfigDao.findConfigValue(SysConfigService.HOLIDAY_SETTING);
+        if(StringUtils.isNotEmpty(holidaySetting)){
+            holidayDays = new HashSet<>(JSON.parseArray(holidaySetting, String.class));
         }
         LocalDate everyDay=monDayDate;
         boolean weekInHoliday = true;
@@ -910,10 +910,18 @@ public class StudentServeServiceImpl implements StudentServeService {
             result.put("isAssignHomework", 0);
             return result;
         }
+        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+        if(StringUtils.isEmpty(configValue)){
+            configValue = "0";
+        }
         List<Integer> studentIds=new ArrayList<>();
         if(StringUtils.isNotBlank(studentIdsStr)){
-            //获取有会员的学员数
-            result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
+            if(configValue.equals("0")){
+                result.put("memberNum",0);
+            }else {
+                //获取有会员的学员数
+                result.put("memberNum", studentDao.getMemberNum(studentIdsStr));
+            }
             studentIds= Arrays.asList(studentIdsStr.split(",")).stream().map(id->Integer.valueOf(id)).collect(Collectors.toList());
         }
 
@@ -925,14 +933,20 @@ public class StudentServeServiceImpl implements StudentServeService {
                 result.put("isAssignHomework", 0);
                 return result;
             }
-            MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-            if(musicGroup != null){
-                result.put("courseViewType", CourseViewTypeEnum.MEMBER_FEE);
+            if(configValue.equals("0")){
+                result.put("memberNum",0);
+                result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
             }else {
-                List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
-                Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
-                result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
+                MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+                if(musicGroup != null){
+                    result.put("courseViewType", musicGroup.getCourseViewType());
+                }else if(result.get("memberNum") == null){
+                    List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
+                    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);
             if(CollectionUtils.isEmpty(courseScheduleStudentPayments)){