Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -47,9 +47,10 @@ public class MemberPriceSettingsController extends BaseController {
 	/**
 	 * 查询分页
 	 */
-	@PostMapping("/page")
+	@GetMapping("/list")
 	@ApiOperation(value = "查询分页", notes = "传入memberPriceSettingsSearch")
-	public HttpResponseResult<PageInfo<MemberPriceSettingsVo>> page(@RequestBody MemberPriceSettingsSearch query) {
+	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
+	public HttpResponseResult<PageInfo<MemberPriceSettingsVo>> page(MemberPriceSettingsSearch query) {
 		IPage<MemberPriceSettingsVo> pages = memberPriceSettingsService.selectPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(pages));
 	}
@@ -59,6 +60,7 @@ public class MemberPriceSettingsController extends BaseController {
 	 */
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ApiOperation(value = "修改", notes = "传入memberPriceSettings")
+	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
 	public HttpResponseResult<Boolean> update(@Valid @RequestBody MemberPriceSettings memberPriceSettings) {
 		SysUser user = sysUserFeignService.queryUserInfo();
 		if (user == null || user.getId() == null) {

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -88,7 +88,7 @@ public class VideoLessonController extends BaseController {
      */
     @ApiOperation(value = "老师详情-视频课详情-教学计划", httpMethod = "POST", consumes = "application/json", produces = "application/json")
     @PostMapping(value = "/teacher/plan", consumes = "application/json", produces = "application/json")
-    public HttpResponseResult<PageInfo<VideoLessonGroupDetail>> page(@Validated(SelectGroup.class) @RequestBody VideoLessonSearch search) {
+    public HttpResponseResult<PageInfo<VideoLessonGroupDetailVo>> page(@Validated(SelectGroup.class) @RequestBody VideoLessonSearch search) {
         return succeed(PageUtil.pageInfo(videoLessonGroupDetailService.selectPage(PageUtil.getPage(search), search)));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -111,6 +111,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
      *              <p> - endDate 结束时间
      *              <p> - subjectId 声部id
      *              <p> - type PRACTICE 陪练课 LIVE 直播课
+     *              <p> - orderState OrderStatusEnum支付状态
      */
     <T> IPage<T> queryStudentLiveCourse(Page<T> page, @Param("param") Map<String, Object> param);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDetailDao.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailUpVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,6 @@ public interface VideoLessonGroupDetailDao extends BaseMapper<VideoLessonGroupDe
 
     //根据组id删除视频课
     void deleteByGroupId(Long groupId);
+
+    List<VideoLessonGroupDetailVo> selectPageAuth(IPage page, @Param("param") VideoLessonSearch query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonGroupDetailService.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailUpVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentVo;
 
@@ -18,7 +19,7 @@ import java.util.List;
  * @version v1.0
  **/
 public interface VideoLessonGroupDetailService extends IService<VideoLessonGroupDetail> {
-    IPage<VideoLessonGroupDetail> selectPage(IPage<VideoLessonGroupDetail> page, VideoLessonSearch query);
+    IPage<VideoLessonGroupDetailVo> selectPage(IPage<VideoLessonGroupDetailVo> page, VideoLessonSearch query);
 
     IPage<VideoLessonPurchaseStudent> selectPageStudent(IPage<VideoLessonPurchaseStudent> page, VideoLessonSearch query);
 
@@ -28,5 +29,5 @@ public interface VideoLessonGroupDetailService extends IService<VideoLessonGroup
 
     void deleteDetail(Long id);
 
-    VideoLessonStudentVo selectVideoLesson(Long groupId);
+    VideoLessonStudentVo selectVideoLesson(Long groupId,Long userId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -19,10 +19,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.PracticeTeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.CourseGroupEnum;
-import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
-import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.TeacherSalaryEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
@@ -802,6 +799,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         param.put("type", CourseScheduleEnum.LIVE.getCode());
         param.put("startDate", firstDay.toString());
         param.put("endDate", lastDay.toString());
+        param.put("orderState", OrderStatusEnum.PAID.getCode());
         Page<CourseStudent> pageInfo = PageUtil.getPageInfo(param);
         pageInfo.setAsc(" cs.start_time_");
         return PageUtil.pageInfo(baseMapper.queryStudentLiveCourse(pageInfo, param));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
@@ -108,9 +109,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacherHomeVo.setPhone(ValueUtil.fuzzyMobile(teacherHomeVo.getPhone()));
         teacherHomeVo.setHeardUrl(user.getAvatar());
 
-        if(YesOrNoEnum.YES.equals(teacher.getEntryFlag())){
+        if (YesOrNoEnum.YES.equals(teacher.getEntryFlag())) {
             teacherHomeVo.setEntryStatus(AuthStatusEnum.PASS);
-        }else{
+        } else {
             TeacherAuthEntryRecordVo entryRecord = entryRecordService.getLastRecordByUserId(user.getId());
             if (null == entryRecord) {
                 teacherHomeVo.setEntryStatus(AuthStatusEnum.UNPAALY);
@@ -119,9 +120,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             }
         }
 
-        if(YesOrNoEnum.YES.equals(teacher.getMusicianFlag())){
+        if (YesOrNoEnum.YES.equals(teacher.getMusicianFlag())) {
             teacherHomeVo.setMusicianAuthStatus(AuthStatusEnum.PASS);
-        }else{
+        } else {
             TeacherAuthMusicianRecord musicianRecord = musicianRecordService.getLastRecordByUserId(user.getId());
             if (null == musicianRecord) {
                 teacherHomeVo.setMusicianAuthStatus(AuthStatusEnum.UNPAALY);
@@ -211,6 +212,13 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacher = getTeacherDetil(teacher, teacherSubmitReq);
         teacher.setUpdateTime(new Date());
         baseMapper.updateById(teacher);
+        if (null == teacher.getEntryAuthDate() || null == teacher.getMusicianDate()) {
+            baseMapper.update(teacher, Wrappers.<Teacher>lambdaUpdate()
+                    .set(Teacher::getEntryAuthDate, teacher.getEntryAuthDate())
+                    .set(Teacher::getMusicianDate, teacher.getMusicianDate())
+                    .eq(Teacher::getUserId, teacher.getUserId())
+            );
+        }
 
         sysUser.setUpdateTime(new Date());
         employeeDao.updateSysUser(sysUser);
@@ -288,10 +296,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     public HttpResponseResult<TeacherVo> queryTeacherStyle(Long id) {
         TeacherVo detail = detail(id);
         LiveRoom liveRoom = liveRoomService.getliveingRoomBySpeakerId(id);
-        if(null != liveRoom){
+        if (null != liveRoom) {
             detail.setRoomUid(liveRoom.getRoomUid());
             detail.setLiveing(YesOrNoEnum.YES);
-        }else{
+        } else {
             detail.setLiveing(YesOrNoEnum.NO);
         }
         return HttpResponseResult.succeed(detail);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -1,17 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.toolset.utils.obj.ObjectUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -39,6 +43,8 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
     private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
     @Autowired
     private VideoLessonGroupDao videoLessonGroupDao;
+    @Autowired
+    private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
 
     public VideoLessonGroupDetailDao getDao() {
         return videoLessonGroupDetailDao;
@@ -50,8 +56,8 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
     * @Date: 2022/3/31
     */
     @Override
-    public IPage<VideoLessonGroupDetail> selectPage(IPage<VideoLessonGroupDetail> page, VideoLessonSearch query) {
-        return page.setRecords(baseMapper.selectPage(page,query));
+    public IPage<VideoLessonGroupDetailVo> selectPage(IPage<VideoLessonGroupDetailVo> page, VideoLessonSearch query) {
+        return page.setRecords(baseMapper.selectPageAuth(page,query));
     }
 
     /**
@@ -131,9 +137,15 @@ public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGr
     * @Date: 2022/4/2
     */
     @Override
-    public VideoLessonStudentVo selectVideoLesson(Long groupId) {
+    public VideoLessonStudentVo selectVideoLesson(Long groupId,Long userId) {
         VideoLessonStudentVo lessonStudentVo = new VideoLessonStudentVo();
 
+        //校验课程是否购买
+        VideoLessonPurchaseRecord isAlreadyBuy= videoLessonPurchaseRecordDao.selectOne(Wrappers.<VideoLessonPurchaseRecord>lambdaQuery()
+                .eq(VideoLessonPurchaseRecord::getStudentId, userId)
+                .eq(VideoLessonPurchaseRecord::getVideoLessonGroupId, groupId));
+        lessonStudentVo.setAlreadyBuy(!ObjectUtil.isEmpty(isAlreadyBuy));
+
         VideoLessonGroupSearch query = new VideoLessonGroupSearch();
         //筛选已审核的视频课
         query.setAuditStatus(AuthStatusEnum.PASS);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonPurchaseRecordServiceImpl.java

@@ -21,6 +21,7 @@ import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.toolset.utils.obj.ObjectUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -83,6 +84,14 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
             throw new BizException("课程组不存在!");
         }
 
+        //校验课程是否购买
+        VideoLessonPurchaseRecord isAlreadyBuy= videoLessonPurchaseRecordDao.selectOne(Wrappers.<VideoLessonPurchaseRecord>lambdaQuery()
+                .eq(VideoLessonPurchaseRecord::getStudentId, studentId)
+                .eq(VideoLessonPurchaseRecord::getVideoLessonGroupId, groupId));
+        if (!ObjectUtil.isEmpty(isAlreadyBuy)){
+            throw new BizException("已购买过该课程");
+        }
+
         purchaseRecord.setOrderNo(orderNo);
         purchaseRecord.setStudentId(studentId);
         purchaseRecord.setOrderStatus(0);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonGroupDetailVo.java

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: cy
+ * @Date: 2022/4/25
+ */
+@ApiModel(value = "VideoLessonGroupDetailVo")
+public class VideoLessonGroupDetailVo extends VideoLessonGroupDetail {
+
+    @ApiModelProperty(value = "老师姓名")
+    private String teacherName;  //主键ID
+
+    @ApiModelProperty(value = "老师手机号")
+    private String teacherPhone;
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public String getTeacherPhone() {
+        return teacherPhone;
+    }
+
+    public void setTeacherPhone(String teacherPhone) {
+        this.teacherPhone = teacherPhone;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonStudentVo.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -16,6 +17,17 @@ public class VideoLessonStudentVo extends BaseEntity {
 
     private List<VideoLessonGroupDetail> detailList;
 
+    @ApiModelProperty(value = "true已买,false未买")
+    private Boolean isAlreadyBuy;
+
+    public Boolean getAlreadyBuy() {
+        return isAlreadyBuy;
+    }
+
+    public void setAlreadyBuy(Boolean alreadyBuy) {
+        isAlreadyBuy = alreadyBuy;
+    }
+
     public VideoLessonGroupVo getLessonGroup() {
         return lessonGroup;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -403,7 +403,7 @@
     </select>
 
     <select id="queryStudentLiveCourse" parameterType="map" resultType="com.yonge.cooleshow.biz.dal.vo.CourseStudent">
-        SELECT
+        SELECT distinct
         cs.id_ AS courseId,
         cs.course_group_id_ AS courseGoupId,
         cs.class_date_ AS classDate,
@@ -424,10 +424,14 @@
         LEFT JOIN course_group g ON cs.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
         LEFT JOIN sys_user su on g.teacher_id_ = su.id_
+        LEFT JOIN user_order o on a.order_no_  = o.order_no_
         WHERE cs.type_=#{param.type}
         AND a.user_id_ = #{param.studentId}
         <![CDATA[ AND class_date_  >= #{param.startDate} ]]>
         <![CDATA[ AND class_date_  <= #{param.endDate} ]]>
+        <if test="param.orderState != null">
+            AND o.status_ = #{param.orderState}
+        </if>
         <if test="param.subjectId != null">
             AND g.subject_id_ = #{param.subjectId}
         </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupDetailMapper.xml

@@ -71,6 +71,30 @@
 		FROM video_lesson_purchase_record
 		WHERE video_lesson_group_id_ = #{param.videoLessonGroupId})
 	</select>
+	<select id="selectPageAuth" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo">
+			SELECT
+			d.id_ AS id,
+			d.video_lesson_group_id_ AS videoLessonGroupId,
+			d.video_title_ AS videoTitle,
+			d.video_content_ AS videoContent,
+			d.video_url_ AS videoUrl,
+			d.cover_url_ AS coverUrl,
+			d.charge_flag_ AS chargeFlag,
+			d.sort_number_ AS sortNumber,
+			d.teacher_id_ AS teacherId,
+			u.username_ AS teacherName,
+			u.phone_ AS teacherPhone,
+			d.create_time_ AS createTime,
+			d.update_by_ AS updateBy,
+			d.update_time_ AS updateTime
+			FROM video_lesson_group_detail d
+			LEFT JOIN sys_user u ON d.teacher_id_=u.id_
+			<where>
+				<if test="param.videoLessonGroupId !=null">
+					AND video_lesson_group_id_ = #{param.videoLessonGroupId}
+				</if>
+			</where>
+	</select>
 	<insert id="insertVideoLesson" parameterType="java.util.List">
 		INSERT INTO video_lesson_group_detail (video_lesson_group_id_,video_title_,video_content_,video_url_,cover_url_,teacher_id_)
 		VALUES

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/VideoLessonController.java

@@ -52,7 +52,11 @@ public class VideoLessonController extends BaseController {
     @ApiOperation(value = "根据组id查询视频课")
     @GetMapping(value = "/selectVideoLesson")
     public HttpResponseResult<VideoLessonStudentVo> selectVideoLesson(@NotNull(message = "视频组id不能为空") Long groupId) {
-        return succeed(detailService.selectVideoLesson(groupId));
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(detailService.selectVideoLesson(groupId,user.getId()));
     }
 
     /**

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupDetailController.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.valid.impl.ValidList;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonEvaluateVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailUpVo;
+import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
@@ -50,8 +51,8 @@ public class VideoLessonGroupDetailController extends BaseController {
      */
     @ApiOperation(value = "查询视频课", httpMethod = "POST", consumes = "application/json", produces = "application/json")
     @PostMapping(value = "/page", consumes = "application/json", produces = "application/json")
-    public HttpResponseResult<PageInfo<VideoLessonGroupDetail>> page(@RequestBody VideoLessonSearch query) {
-        IPage<VideoLessonGroupDetail> pages = videoLessonGroupDetailService.selectPage(PageUtil.getPage(query), query);
+    public HttpResponseResult<PageInfo<VideoLessonGroupDetailVo>> page(@RequestBody VideoLessonSearch query) {
+        IPage<VideoLessonGroupDetailVo> pages = videoLessonGroupDetailService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }