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

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

@@ -9,6 +9,8 @@ import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.vo.*;
 
+import java.util.List;
+
 /**
  * VideoLessonGroupService服务类
  *
@@ -19,6 +21,8 @@ import com.yonge.cooleshow.biz.dal.vo.*;
 public interface VideoLessonGroupService extends IService<VideoLessonGroup> {
     IPage<VideoLessonGroupVo> selectPage(IPage<VideoLessonGroupVo> page, VideoLessonGroupSearch query);
 
+    List<VideoLessonGroupVo> selectPage(VideoLessonGroupSearch query);
+
     VideoLessonGroup selectGroup(Long groupId);
 
     void updateGroup(VideoLessonGroupUpVo lessonGroupUpVo);

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,6 +74,12 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         return page.setRecords(baseMapper.selectPage(page, query));
     }
 
+    public List<VideoLessonGroupVo> selectPage(VideoLessonGroupSearch query) {
+        List<VideoLessonGroupVo> list = baseMapper.selectPage(null, query);
+        List<VideoLessonGroupVo> collect = list.stream().sorted(Comparator.comparing(VideoLessonGroupVo::getCountStudent, Comparator.reverseOrder())).limit(2).collect(Collectors.toList());
+        return collect;
+    }
+
     /**
      * @Description: 根据组id查详情
      * @Author: cy
@@ -121,15 +128,15 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
         //推送
         VideoLessonGroup lessonGroup = baseMapper.selectById(examineVo.getId());
         String status = examineVo.getAuditStatus();
-        Map<Long,String> receivers = new HashMap<>();
+        Map<Long, String> receivers = new HashMap<>();
         SysUser teacher = sysUserFeignService.queryUserById(lessonGroup.getTeacherId());
         receivers.put(lessonGroup.getTeacherId(), teacher.getPhone());
         if (status.equals("PASS")) {
             try {
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.VIDEO_SHEET_AUTH_PASS,
-                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(),lessonGroup.getLessonName());
-            }catch (Exception e){
-                log.warn("视频课审核失败，{}",e.getMessage());
+                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(), lessonGroup.getLessonName());
+            } catch (Exception e) {
+                log.warn("视频课审核失败，{}", e.getMessage());
             }
         } else {
             try {
@@ -138,9 +145,9 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
                     remark = examineVo.getRemarks();
                 }
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.VIDEO_SHEET_AUTH_UNPASS,
-                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(),lessonGroup.getLessonName(),remark);
-            }catch (Exception e){
-                log.warn("视频课审核失败，{}",e.getMessage());
+                        receivers, null, 0, null, ClientEnum.TEACHER.getCode(), lessonGroup.getLessonName(), remark);
+            } catch (Exception e) {
+                log.warn("视频课审核失败，{}", e.getMessage());
             }
         }
 

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

@@ -222,7 +222,7 @@
         cssp.id_ as paymentId,
         su.id_ as studentId,
         su.username_ as studentName,
-        cssp.actual_price_ as price,
+        sum(cssp.actual_price_) as price,
         cssp.order_no_ as orderNo,
         su.phone_ as phone,
         cssp.created_time_ as payTime
@@ -250,6 +250,7 @@
                 and #{param.endTime} >= cssp.created_time_
             </if>
         </where>
+        group by cssp.actual_price_
         order by  cssp.id_ desc
     </select>
 

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

@@ -219,7 +219,7 @@ public class TeacherCourseScheduleController extends BaseController {
             @ApiImplicitParam(name = "month", dataType = "String", value = "月份,yyyy-mm"),
             @ApiImplicitParam(name = "status", dataType = "String", value = "课程状态"),
     })
-    @ApiOperation("课程列表")
+    @ApiOperation("琴房课程列表")
     @PostMapping("/selectCourseList")
     public HttpResponseResult<PageInfo<CourseScheduleRecordVo>> selectCourseList(@RequestBody Map<String, Object> param) {
         SysUser user = sysUserFeignService.queryUserInfo();

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenVideoGroupController.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 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.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -26,6 +28,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 视频课基本信息表 web 控制层
@@ -43,6 +46,8 @@ public class OpenVideoGroupController extends BaseController {
     private TeacherService teacherService;
     @Autowired
     private VideoLessonGroupService videoLessonGroupService;
+    @Autowired
+    private VideoLessonGroupDetailService videoLessonGroupDetailService;
 
     /**
     * @Description: 查询视频课组
@@ -56,7 +61,6 @@ public class OpenVideoGroupController extends BaseController {
         return succeed(PageUtil.pageInfo(pages));
     }
 
-
     /**
      * @Description: 根据组id查询视频课&视频课组
      * @Author: cy
@@ -68,6 +72,21 @@ public class OpenVideoGroupController extends BaseController {
         return succeed(videoLessonGroupService.selectVideoLesson(groupId));
     }
 
+    /**
+     * @Description: 根据视频课组id查详情
+     * @Author: cy
+     * @Date: 2022/6/27
+     */
+    @ApiOperation(value = "查询视频课", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @PostMapping(value = "/info/page", consumes = "application/json", produces = "application/json")
+    public HttpResponseResult<PageInfo<VideoLessonGroupDetailVo>> page(@RequestBody VideoLessonSearch query) {
+        IPage<VideoLessonGroupDetailVo> pages = videoLessonGroupDetailService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
 
-
+    @ApiOperation(value = "其他课程")
+    @PostMapping("/otherLesson")
+    public HttpResponseResult<List<VideoLessonGroupVo>> otherLesson(@RequestBody VideoLessonGroupSearch query) {
+        return succeed(videoLessonGroupService.selectPage(query));
+    }
 }