1、陪练课调整

2、付费陪练课

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/PracticeLessonApplyDao.java

@@ -40,4 +40,13 @@ public interface PracticeLessonApplyDao extends com.ym.mec.common.dal.BaseDAO<In
      * @return
      */
     Integer getMakeNum(@Param("userIds") Set<Integer> userIds);
-}
+
+    /**
+     * @describe 检测用户是否已经预约
+     * @author Joburgess
+     * @date 2020/2/22
+     * @param userId:
+     * @return int
+     */
+    int checkUserIsApply(@Param("userId") Integer userId);
+}

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

@@ -24,6 +24,15 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
 	List<CourseScheduleDto> findUserPracticeCourses(Integer userId);
 
 	/**
+	 * @describe 检测用户是否能够申请免费陪练课
+	 * @author Joburgess
+	 * @date 2020/2/22
+	 * @param userId:
+	 * @return java.util.Map<java.lang.String,java.lang.Object>
+	 */
+	Map<String,Object> checkCanApplyFreePracticeGroup(Integer userId);
+
+	/**
 	 * 给学生指派老师
 	 * @param practiceGroup: 申请参数
 	 * @return

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

@@ -113,6 +113,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     private TeacherDefaultPracticeGroupSalaryDao teacherDefaultPracticeGroupSalaryDao;
     @Autowired
     private ContractService contractService;
+    @Autowired
+    private PracticeLessonApplyDao practiceLessonApplyDao;
 
     private static Map<Integer, Map<Integer, List<Integer>>> schoolSubjectTeachersMap;
 
@@ -205,6 +207,22 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
+    public Map<String, Object> checkCanApplyFreePracticeGroup(Integer userId) {
+        Map<String,Object> result=new HashMap<>();
+        int recordNum = practiceLessonApplyDao.checkUserIsApply(userId);
+        LocalDateTime now=LocalDateTime.now();
+        if(recordNum>0){
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-03-01 00:00:00", DateUtil.dateTimeFormatter);
+            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
+        }else{
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 08:00:00", DateUtil.dateTimeFormatter);
+            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
+        }
+
+        return result;
+    }
+
+    @Override
     public Integer searchTeacherId(PracticeGroup practiceGroup) {
         if (Objects.isNull(practiceGroup.getSubjectId())) {
             return null;
@@ -1625,6 +1643,25 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return result;
         }
 
+        int recordNum = practiceLessonApplyDao.checkUserIsApply(practiceGroup.getStudentId());
+        if(recordNum>0){
+            LocalDateTime nowDateTime=LocalDateTime.now();
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-03-01 00:00:00", DateUtil.dateTimeFormatter);
+            if(nowDateTime.compareTo(applyExpireDateTime)>0){
+                result.put("status", "APPLY_DATE_OVERFLOW");
+                result.put("info", "预约失败，超出可预约时间范围。");
+                return result;
+            }
+        }else{
+            LocalDateTime nowDateTime=LocalDateTime.now();
+            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 08:00:00", DateUtil.dateTimeFormatter);
+            if(nowDateTime.compareTo(applyExpireDateTime)>0){
+                result.put("status", "APPLY_DATE_OVERFLOW");
+                result.put("info", "预约失败，超出可预约时间范围。");
+                return result;
+            }
+        }
+
         List<Date> allCourseDates = new ArrayList<>();
         allCourseDates.add(practiceGroup.getFirstCourseTime());
         allCourseDates.add(practiceGroup.getSecondCourseTime());
@@ -2458,7 +2495,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         int courseWeekNum = 0;
         int practiceCourseNum = 0;
-        boolean hasDisableWeek = false;
+        Set<Integer> disableApplyWeek = new HashSet<>();
         LocalDateTime tempClassDateTime;
         for (int i = 0; i < allTeacherCourses.size(); i++) {
             CourseSchedule teacherCourse = allTeacherCourses.get(i);
@@ -2468,8 +2505,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 courseWeekNum = tempClassDateTime.get(weekFields.weekOfYear());
             }
             if (Objects.nonNull(maxTeacherCourses) && practiceCourseNum >= maxTeacherCourses) {
-                hasDisableWeek = true;
-                break;
+                disableApplyWeek.add(courseWeekNum);
             }
             if (tempClassDateTime.get(weekFields.weekOfYear()) != courseWeekNum) {
                 courseWeekNum = tempClassDateTime.get(weekFields.weekOfYear());
@@ -2480,12 +2516,18 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        if (hasDisableWeek) {
-            result.put("teacherFreeDays", new HashMap<>());
-            return result;
+        Iterator<Integer> weekNumApplyTimeIterator2 = weekNumApplyTimesMap.keySet().iterator();
+        while (weekNumApplyTimeIterator2.hasNext()) {
+            Integer weekNum=weekNumApplyTimeIterator2.next();
+            if(disableApplyWeek.contains(weekNum)){
+                weekNumApplyTimeIterator2.remove();
+            }
         }
 
         for (CourseSchedule teacherCourse : allTeacherCourses) {
+            if(teacherCourse.getEndClassTime().before(applyStartDate)||teacherCourse.getStartClassTime().after(applyEndDate)){
+                continue;
+            }
             LocalDateTime courseStartTime = LocalDateTime.ofInstant(teacherCourse.getStartClassTime().toInstant(), zoneId);
             LocalDateTime courseEndTime = LocalDateTime.ofInstant(teacherCourse.getEndClassTime().toInstant(), zoneId);
             List<String> applyTimeStrs = weekNumApplyTimesMap.get(courseStartTime.getDayOfWeek().getValue());

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

@@ -12,8 +12,8 @@
 		<result column="create_time_" property="createTime" />
 		<result column="memo_" property="memo" />
 	</resultMap>
-	
-	
+
+
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="PracticeLessonApply">
 		SELECT * FROM practice_lesson_apply
@@ -82,4 +82,7 @@
 			#{item}
 		</foreach>
 	</select>
+	<select id="checkUserIsApply" resultType="int">
+		SELECT COUNT(user_id_) FROM practice_lesson_apply WHERE user_id_=#{userId}
+	</select>
 </mapper>

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

@@ -14,10 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Author Joburgess
@@ -44,6 +41,18 @@ public class PracticeGroupController extends BaseController {
         return succeed(practiceGroupService.findUserPracticeCourses(sysUser.getId()));
     }
 
+    @ApiOperation("检测用户是否能够申请免费陪练课")
+    @GetMapping(value = "/checkCanApplyFreePracticeGroup")
+    private HttpResponseResult checkCanApplyFreePracticeGroup(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        Map<String,Object> result=practiceGroupService.checkCanApplyFreePracticeGroup(sysUser.getId());
+        result.put("organId", sysUser.getOrganId());
+        return succeed(result);
+    }
+
     @ApiOperation("获取陪练课预约参数")
     @GetMapping(value = "/getPracticeApplyParams")
     public Object getPracticeApplyParams(){