1、陪练课调整

2、付费陪练课可预约时间调整

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

@@ -121,6 +121,10 @@ public interface PracticeGroupDao extends com.ym.mec.common.dal.BaseDAO<Long, Pr
      */
     List<PracticeCourseDto> findUserBuyPracticeGroups(@Param("userId") Integer userId);
 
+
+    List<PracticeCourseDto> findUserBuyPracticeGroupsWithDate(@Param("userId") Integer userId,
+                                                          @Param("date") Date date);
+
     /**
      * @describe 获取已经达到截至时间的陪练课程组
      * @author Joburgess

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

@@ -195,7 +195,7 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
 	 * @param userId:
 	 * @return java.util.List<com.ym.mec.biz.dal.dto.PracticeCourseDto>
 	 */
-	List<PracticeCourseDto> findUserHistoryBuyPracticeGroups(Integer userId);
+	List<PracticeCourseDto> findUserHistoryBuyPracticeGroups(Integer userId, Long groupId);
 
 	/**
 	 * @describe 查询订单信息

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

@@ -3117,8 +3117,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     }
 
     @Override
-    public List<PracticeCourseDto> findUserHistoryBuyPracticeGroups(Integer userId) {
-        List<PracticeCourseDto> userPracticeGroups = practiceGroupDao.findUserBuyPracticeGroups(userId);
+    public List<PracticeCourseDto> findUserHistoryBuyPracticeGroups(Integer userId, Long groupId) {
+        List<PracticeCourseDto> userPracticeGroups;
+        if(Objects.nonNull(groupId)){
+            PracticeGroup practiceGroup = practiceGroupDao.get(groupId);
+            Date date = DateUtil.addSeconds(practiceGroup.getCoursesExpireDate(), 1);
+            userPracticeGroups=practiceGroupDao.findUserBuyPracticeGroupsWithDate(userId,date);
+        }else{
+            userPracticeGroups = practiceGroupDao.findUserBuyPracticeGroups(userId);
+        }
+
         if(CollectionUtils.isEmpty(userPracticeGroups)){
             return new ArrayList<>();
         }

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

@@ -153,6 +153,22 @@
 			AND (pg.group_status_='NORMAL' OR pg.group_status_='LOCK')
 			AND pg.buy_months_ IS NOT NULL
 	</select>
+
+	<select id="findUserBuyPracticeGroupsWithDate" resultMap="PracticeCourseDto">
+		SELECT
+			pg.*,
+			su.real_name_,
+			su.avatar_,
+			s.name_ subject_name_
+		FROM
+			practice_group pg
+			LEFT JOIN sys_user su ON pg.user_id_ = su.id_
+			LEFT JOIN `subject` s ON pg.subject_id_ = s.id_
+		WHERE
+			student_id_=#{userId}
+			AND courses_start_date_=#{date} AND group_status_='LOCK'
+			AND pg.buy_months_ IS NOT NULL
+	</select>
 	<select id="findUserPracticeGroup" resultMap="PracticeGroup">
 		SELECT * FROM practice_group WHERE student_id_=#{userId} AND id_=#{groupId};
 	</select>

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

@@ -185,12 +185,12 @@ public class PracticeGroupController extends BaseController {
 
     @ApiOperation("获取用户历史购买的陪练课")
     @GetMapping(value = "/findUserHistoryBuyPracticeGroups")
-    public HttpResponseResult findUserHistoryBuyPracticeGroups(){
+    public HttpResponseResult findUserHistoryBuyPracticeGroups(Long groupId){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(practiceGroupService.findUserHistoryBuyPracticeGroups(sysUser.getId()));
+        return succeed(practiceGroupService.findUserHistoryBuyPracticeGroups(sysUser.getId(), groupId));
     }
 
     @ApiOperation("查询订单信息")