1、陪练课调整

2、付费陪练课

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -72,6 +71,26 @@ public class CourseListDto {
 
     private Integer isApply;
 
+    private Integer practiceType;
+
+    private String practiceRenewUrl;
+
+    public String getPracticeRenewUrl() {
+        return practiceRenewUrl;
+    }
+
+    public void setPracticeRenewUrl(String practiceRenewUrl) {
+        this.practiceRenewUrl = practiceRenewUrl;
+    }
+
+    public Integer getPracticeType() {
+        return practiceType;
+    }
+
+    public void setPracticeType(Integer practiceType) {
+        this.practiceType = practiceType;
+    }
+
     public String getPracticeId() {
         return practiceId;
     }

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

@@ -163,6 +163,11 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String STUDENT_STUDY_REPORT_URL = "student_study_report_url";
 
     /**
+     * @describe 陪练课续费地址
+     */
+    String PRACTICE_RENEW_URL = "practice_renew_url";
+
+    /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName
      * @describe 根据配置名称获取配置信息

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

@@ -110,6 +110,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private GroupDao groupDao;
     @Autowired
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
+    @Autowired
+    private SysConfigService sysConfigService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -643,6 +645,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         Set<Integer> schoolIds = courseListDtos.stream().map(CourseListDto::getTeacherSchoolId).collect(Collectors.toSet());
         Map<Integer, String> schoolNames = MapUtil.convertMybatisMap(schoolDao.queryNameByIds(StringUtils.join(schoolIds, ",")));
 
+        SysConfig practiceRenewUrlConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_RENEW_URL);
+
         Long classTimes = null;
         for (CourseListDto e:courseListDtos) {
             if(StringUtils.isNotEmpty(e.getMusicId())){
@@ -658,6 +662,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             e.setIsApply(isApplyMap.get(e.getMusicId()));
             if(ClassGroupTypeEnum.PRACTICE == e.getType()){
                 e.setStudentNames(practiceStuNames.get(e.getPracticeId()));
+                e.setPracticeRenewUrl(practiceRenewUrlConfig.getParanValue());
             }
             if (ClassGroupTypeEnum.VIP == e.getType()) {
                 e.setStudentNames(vipStuNames.get(e.getVipId()));

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

@@ -2093,7 +2093,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(Objects.isNull(groupId)){
             throw new BizException("请选择续费的课程");
         }
-        return practiceGroupDao.findUserPracticeGroup2(userId, groupId);
+        Date now=new Date();
+        PracticeGroupDto userPracticeGroup = practiceGroupDao.findUserPracticeGroup2(userId, groupId);
+        if(userPracticeGroup.getCoursesExpireDate().before(now)){
+            throw new BizException("此课程组已超过可续费期限");
+        }
+        return userPracticeGroup;
     }
 
     @Override
@@ -2438,9 +2443,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
 
         if (CollectionUtils.isEmpty(allTeacherCourses)) {
-            if(weekNumApplyTimesMap.size()<=1){
-                weekNumApplyTimesMap=new HashMap<>();
-            }
             result.put("teacherFreeDays", weekNumApplyTimesMap);
             return result;
         }

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -736,6 +736,7 @@
         <result column="offline_classes_num_" property="offLineClassesNum"/>
         <result column="teacher_school_id_" property="teacherSchoolId"/>
         <result column="class_mode_" property="classMode"/>
+        <result column="practice_type_" property="practiceType"/>
         <result column="payment_status_" property="paymentStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
@@ -766,7 +767,8 @@
     <select id="queryStudentPracticeCourses" resultMap="CourseListDto">
         SELECT cg.id_ class_group_id_,pg.name_ music_group_name_,su.real_name_,
         cg.current_class_times_,cg.total_class_times_,pg.single_class_minutes_,
-        pg.id_ practice_id_,cg.type_,1 class_mode_
+        pg.id_ practice_id_,cg.type_,1 class_mode_,
+        IF(pg.buy_months_ IS NULL,0,1) practice_type_
         FROM practice_group pg
         LEFT JOIN class_group cg ON cg.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON pg.user_id_ = su.id_