update

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

@@ -1,13 +1,11 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public interface SchoolDao extends BaseDAO<Integer, School> {
 
@@ -40,7 +38,7 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      * @param userId: 教师编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
-    List<School> findVipSchoolByUserId(Integer userId);
+    List<School> findVipSchoolByUserId(Integer userId,Integer isDefault);
 
 
-}
+}

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

@@ -242,4 +242,5 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 	 * @return
 	 */
 	Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
+
 }

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

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.School;
-import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
@@ -22,5 +21,5 @@ public interface SchoolService extends BaseService<Integer, School> {
      * @param teacherId:
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
-    List<School> findVipSchoolByTeacher(Integer teacherId);
-}
+    List<School> findVipSchoolByTeacher(Integer teacherId,Integer isDefault);
+}

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

@@ -257,5 +257,13 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return void
      */
     void updateVipGroupBaseInfo(VipGroupApplyBaseInfoDto vipGroupApplyBaseInfo);
+
+    /**
+     * @describe 取消达到报名时间认为达到报名人数的vip课
+     * @author Joburgess
+     * @date 2019/11/13
+     * @return void
+     */
+    void stopVipGroupWithNoCreate();
     
 }

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

@@ -591,7 +591,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		newCourseSchedules.forEach(newCourseSchedule -> {
 
 			if(newCourseSchedule.getStartClassTime().before(tomorrow)&&sysUser.getUserType().equals(SysUserType.TEACHER)){
-			    throw new BizException("调整时间必须为明天以后");
+			    throw new BizException("调整时间必须为明天及以后");
             }
 
 			CourseSchedule oldCourseSchedule = oldCourseSchedules.get(newCourseSchedule.getId());

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

@@ -29,7 +29,7 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  impleme
 	}
 
 	@Override
-	public List<School> findVipSchoolByTeacher(Integer teacherId) {
-		return schoolDao.findVipSchoolByUserId(teacherId);
+	public List<School> findVipSchoolByTeacher(Integer teacherId,Integer isDefault) {
+		return schoolDao.findVipSchoolByUserId(teacherId,isDefault);
 	}
-}
+}

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

@@ -394,10 +394,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				if(Objects.isNull(totalClassTimes)){
 					vipGroup.setMonthConsumeRate(0.0);
 				}else{
-					BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
+					if(totalClassTimes<=0){
+						vipGroup.setMonthConsumeRate((double) 0);
+					}else{
+						BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
+
+						Double monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,2,BigDecimal.ROUND_HALF_UP).doubleValue();
+						vipGroup.setMonthConsumeRate(monthConsumeRate);
+					}
+
 
-					Double monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,2,BigDecimal.ROUND_HALF_UP).doubleValue();
-					vipGroup.setMonthConsumeRate(monthConsumeRate);
 				}
 
 			});
@@ -511,7 +517,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("未找到指定课程");
 		}
 		StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(vipGroupId);
-		if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)){
+		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
 			vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class));
 		}
 
@@ -1250,4 +1256,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				byTeacherAndCategory.getOnlineClassesSalary(),
 				byTeacherAndCategory.getOfflineClassesSalary());
 	}
+
+	@Override
+	public void stopVipGroupWithNoCreate() {
+
+	}
 }

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

@@ -856,7 +856,7 @@
                     leave_student_num_ = #{item.leaveStudentNum},
                 </if>
                 <if test="item.schoolId != null">
-                    school_id_ = #{item.schoolId},
+                    schoole_id_ = #{item.schoolId},
                 </if>
             </set>
             WHERE id_ = #{item.id}

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

@@ -124,6 +124,17 @@
         select * from school where del_flag_ = 0 and user_id_ = #{userId}
     </select>
     <select id="findVipSchoolByUserId" resultMap="School">
-        select * from school where del_flag_ = 0 and (user_id_ IS NULL OR user_id_ = #{userId})
+        SELECT
+            *
+        FROM
+            school
+        WHERE
+            del_flag_ = 0
+            <if test="isDefault==null">
+                AND ( user_id_ IS NULL OR user_id_ = #{userId} )
+            </if>
+            <if test="isDefault!=null">
+                AND user_id_ = #{userId}
+            </if>
     </select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSchoolController.java

@@ -61,11 +61,11 @@ public class TeacherSchoolController extends BaseController {
 
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher")
-    public Object findVipSchoolByTeacher(){
+    public Object findVipSchoolByTeacher(Integer isDefault){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId()));
+        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),isDefault));
     }
 }

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -964,7 +964,13 @@ public class DateUtil {
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(date);
 		cal.add(Calendar.DATE, days);
-		return cal.getTime();
+		try {
+			return new SimpleDateFormat(DateUtil.DEFAULT_PATTERN)
+					.parse(new SimpleDateFormat(DateUtil.DEFAULT_PATTERN)
+							.format(cal.getTime()));
+		} catch (ParseException e) {
+			return cal.getTime();
+		}
 	}
 
 	/**