Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MyFens;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.biz.dal.wrapper.TeacherFreeTimeWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -269,4 +270,11 @@ public class TeacherController extends BaseController {
         return succeed(one);
 
     }
+
+    //获取老师可排课时间段
+    @ApiOperation(value = "获取老师可排课时间段")
+    @GetMapping("/queryTeacherTime")
+    public HttpResponseResult<TeacherFreeTimeWrapper.TeacherFreeConfig> queryTeacherTime() {
+        return succeed(teacherService.queryTeacherTime());
+    }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseGroupController.java

@@ -52,9 +52,6 @@ public class TeacherCourseGroupController extends BaseController {
     private SysUserService sysUserService;
 
     @Resource
-    private SysMessageService sysMessageService;
-
-    @Resource
     private AppVersionInfoService appVersionInfoService;
     @ApiOperation("直播课详情")
     @GetMapping("/queryLiveCourseInfo")
@@ -156,8 +153,13 @@ public class TeacherCourseGroupController extends BaseController {
     @ApiOperation("老师端获取单个课程组")
     @PostMapping("/getCourseGroup")
     public HttpResponseResult<CourseGroupWrapper.TeacherCourseGroupDto> getCourseGroup(Long courseGroupId) {
+        CourseGroup courseGroup = courseGroupService.getById(courseGroupId);
+        if (courseGroup == null) {
+            return failed("课程组不存在");
+        }
         CourseGroupWrapper.TeacherCourseGroupQuery query = new CourseGroupWrapper.TeacherCourseGroupQuery();
         query.setCourseGroupId(courseGroupId);
+        query.setCourseType(courseGroup.getType());
         IPage<CourseGroupWrapper.TeacherCourseGroupDto> pages = courseGroupService.teacherCourseGroup(PageUtil.getPage(query), query);
         return succeed(pages.getRecords().get(0));
     }

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -31,6 +31,7 @@ public interface SysConfigConstant {
      * 趣纠课可选时长配置
      */
     String PRACTICE_TIMES_SETTING = "practice_times_setting";
+    String VIP_COURSE_TIMES_SETTING = "vip_course_times_setting";
     /**
      * 直播课服务费
      */

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

@@ -53,4 +53,6 @@ public interface ActivityPlanRewardDao extends BaseMapper<ActivityPlanReward>{
 	 * @param activityRewardId   活动关闻奖品id
 	 */
 	int reduceStock(@Param("activityId") Long activityId, @Param("activityRewardId") Long activityRewardId);
+
+    List<ActivityPlanRewardDto> queryMemberActivityPlanReward(@Param("activityId") Long activityId);
 }

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

@@ -76,4 +76,6 @@ public interface ActivityPlanRewardService extends IService<ActivityPlanReward>
 	 * @return
 	 */
     int reduceStock(Long activityId, Long activityRewardId);
+
+    List<ActivityPlanRewardDto> queryMemberActivityPlanReward(Long activityId);
 }

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

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.TeacherFreeTimeWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -213,4 +214,6 @@ public interface TeacherService extends IService<Teacher> {
     String updateUserCustomerService(Long userId);
 
     void delFans(Long studentId, Long teacherId);
+
+    TeacherFreeTimeWrapper.TeacherFreeConfig queryTeacherTime();
 }

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

@@ -190,4 +190,9 @@ public class ActivityPlanRewardServiceImpl extends ServiceImpl<ActivityPlanRewar
         return baseMapper.reduceStock(activityId, activityRewardId);
     }
 
+    @Override
+    public List<ActivityPlanRewardDto> queryMemberActivityPlanReward(Long activityId) {
+        return baseMapper.queryMemberActivityPlanReward(activityId);
+    }
+
 }

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

@@ -159,8 +159,13 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             return null;
         }
         //查询活动奖品
-        List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryActivityPlanReward(id);
-        detail.setActivityRewardList(activityRewardList);
+        if(ActivityTypeEnum.MEMBER.equals(detail.getActivityType())){
+            List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryMemberActivityPlanReward(id);
+            detail.setActivityRewardList(activityRewardList);
+        }else {
+            List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryActivityPlanReward(id);
+            detail.setActivityRewardList(activityRewardList);
+        }
         //获取已购买次数
         Long userId = sysUserService.getUserId();
         detail.setBuyNum(userPaymentCoreService.getActivityCount(userId,ClientEnum.STUDENT,id));

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

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -56,6 +58,7 @@ import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.wordfilter.WordFilter;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.TeacherFreeTimeWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
@@ -1664,4 +1667,17 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacherTotalService.totalTeacherTotalById(teacherId);
         studentTotalService.totalStudentTotalById(studentId);
     }
+
+    @Override
+    public TeacherFreeTimeWrapper.TeacherFreeConfig queryTeacherTime() {
+        TeacherFreeTimeWrapper.TeacherFreeConfig teacherFreeConfig = new TeacherFreeTimeWrapper.TeacherFreeConfig();
+        teacherFreeConfig.setStartTime(sysConfigService.findConfigValue(SysConfigConstant.COURSE_START_SETTING));
+        teacherFreeConfig.setEndTime(sysConfigService.findConfigValue(SysConfigConstant.COURSE_END_SETTING));
+        List<TeacherFreeTimeWrapper.CourseConfigDto> vipCourseTime = JSON.parseArray(sysConfigService.findConfigValue(SysConfigConstant.VIP_COURSE_TIMES_SETTING),TeacherFreeTimeWrapper.CourseConfigDto.class);
+        vipCourseTime.addAll(JSON.parseArray(sysConfigService.findConfigValue(SysConfigConstant.PRACTICE_TIMES_SETTING),TeacherFreeTimeWrapper.CourseConfigDto.class));
+        //获取空闲时间 + 课程时间 两者之和最大的时间
+        int maxTime = vipCourseTime.stream().mapToInt(o -> o.getCourseMinutes() + o.getFreeMinutes()).max().orElse(0);
+        teacherFreeConfig.setIntervalTime(maxTime);
+        return teacherFreeConfig;
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TeacherFreeTimeWrapper.java

@@ -28,4 +28,37 @@ public class TeacherFreeTimeWrapper {
         private String sortRule;
     }
 
+    @Data
+    public static class TeacherFreeConfig{
+
+        @ApiModelProperty(value = "可排课开始时间")
+        private String startTime;
+
+        @ApiModelProperty(value = "可排课结束时间")
+        private String endTime;
+
+        @ApiModelProperty(value = "排课间隔时长")
+        private Integer intervalTime;
+
+    }
+
+    @Data
+    public static class CourseConfigDto{
+        @ApiModelProperty(value = "课程时长")
+        private Integer courseMinutes;
+
+        @ApiModelProperty(value = "空闲时长")
+        private Integer freeMinutes;
+
+        @ApiModelProperty(value = "最低价格")
+        private BigDecimal lowestPrice;
+
+        @ApiModelProperty(value = "最高价格")
+        private BigDecimal highestPrice;
+
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+    }
+
 }

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

@@ -84,9 +84,17 @@
             </foreach>
         </if>
     </select>
+    <select id="queryMemberActivityPlanReward"
+            resultType="com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto">
+        select <include refid="baseColumns" />,
+            mps.vip_type_ as "activityReward.rewardType",mps.period_ as "activityReward.unit",mps.id_ as "activityReward.vipCardId"
+        from activity_plan_reward t
+        left join member_price_settings mps ON mps.id_ = t.reward_id_
+        where t.activity_id_ = #{activityId}
+    </select>
 
 
-	<update id="reduceStock">
+    <update id="reduceStock">
         update activity_plan_reward set reward_stock_ = reward_stock_ - 1 where id_ = #{activityRewardId} AND activity_id_ = #{activityId} and reward_stock_ > 0
     </update>
 </mapper>