update

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

@@ -194,7 +194,8 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @params [vipGroupId]
      * @describe 根据小课获取关联的班级信息
      */
-    ClassGroup findByVipGroup(Long vipGroupId);
+    ClassGroup findByVipGroup(@Param("vipGroupId") Long vipGroupId,
+                              @Param("delFlag") Integer delFlag);
 
     /**
      * @return com.ym.mec.biz.dal.entity.ClassGroup

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

@@ -553,4 +553,6 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.Integer>>
      */
     List<Map<Integer,Integer>> countClassGroupCourseTimes(@Param("classGroupIds") List<Integer> classGroupIds);
+
+
 }

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -284,4 +285,13 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
 	 */
 	List<CourseSchedule> findCourseScheduleByClassGroup(Integer classGroupId);
+
+	/**
+	 * @describe
+	 * @author Joburgess
+	 * @date 2019/11/14
+	 * @param queryInfo:
+	 * @return com.ym.mec.common.page.PageInfo
+	 */
+	PageInfo findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo);
 }

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

@@ -11,6 +11,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
@@ -1020,6 +1021,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		return courseScheduleDao.findNoStartCoursesByClassGroupId(classGroupId);
     }
 
+
+
 	@Override
 	public void studentCoursesScheduleRemind() {
 		List<Mapper> mapperList = courseScheduleDao.queryStudentCoursesTimesOfTomorrow();
@@ -1097,4 +1100,36 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 		return courseScheduleDao.findByClassGroups(classGroupIds);
 	}
+
+	@Override
+	public PageInfo findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo) {
+		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+
+		if(Objects.isNull(queryInfo.getVipGroupId())){
+			throw new BizException("请指定vip课程");
+		}
+
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		VipGroup vipGroup = vipGroupDao.get(queryInfo.getVipGroupId());
+		if(Objects.isNull(vipGroup)){
+			throw new BizException("指定的vip课不存在");
+		}
+
+		List<CourseSchedule> dataList;
+		if(StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())){
+			dataList=JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
+		}else{
+			dataList=courseScheduleDao.findVipGroupCourseSchedules(vipGroup.getId());
+		}
+
+		int count=dataList.size();
+		if(count>0){
+			pageInfo.setTotal(count);
+			dataList=dataList.stream().skip(pageInfo.getOffset()).limit(pageInfo.getLimit()).collect(Collectors.toList());
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
 }

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

@@ -754,7 +754,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyBaseInfoDto.getUserId());
 
-		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId);
+		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId,null);
         classGroup.setDelFlag(YesOrNoEnum.NO);
         classGroupDao.update(classGroup);
 
@@ -1100,7 +1100,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			vipGroupSalaryBaseInfo.setTotalFeeDeduction(new BigDecimal(0));
 		}
 
-		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroup.getId());
+		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroup.getId(),null);
 		BigDecimal studentNum=new BigDecimal(classGroup.getStudentNum());
 		//课程总价
 		vipGroupSalaryBaseInfo.setTotalCoursePrice(vipGroup.getTotalPrice().multiply(studentNum));

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

@@ -366,7 +366,10 @@
         FROM
             vip_group_class_group_mapper vcgm
             LEFT JOIN class_group cg ON vcgm.class_group_id_ = cg.id_
-            WHERE vcgm.vip_group_id_=#{vipGroupId} AND cg.del_flag_ = 0
+            WHERE vcgm.vip_group_id_=#{vipGroupId}
+            <if test="delFlag!=null">
+                AND cg.del_flag_ = #{delFlag}
+            </if>
     </select>
 
     <select id="lockClassGroup" resultMap="ClassGroup">

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

@@ -319,7 +319,7 @@ public class StudentOrderController extends BaseController {
 
     }
 
-    //@Scheduled(cron = "0/30 * * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void setSuccessStatus() throws Exception {
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
+import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleComplaintsService;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -102,6 +103,13 @@ public class CourseScheduleController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "获取vip课程计划")
+    @PostMapping(value = "/findVipGroupCourseSchedules")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/findVipGroupCourseSchedules')")
+    public Object findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo){
+        return succeed(scheduleService.findVipGroupCourseSchedules(queryInfo));
+    }
+
     @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
     @GetMapping("/getCourseScheduleDateByMonth")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCourseScheduleDateByMonth')")