Merge remote-tracking branch 'origin/feature/1113-vipCourse' into feature/1113-vipCourse

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

@@ -1253,6 +1253,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Author: cy
      * @Date: 2022/4/21
      */
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<OrderCreateRes> buyPracticeCourse(OrderReq.OrderReqInfo orderReqInfo) {
         ObjectMapper objectMapper = new ObjectMapper();
         PracticeScheduleDto scheduleDto = objectMapper.convertValue(orderReqInfo.getBizContent(), PracticeScheduleDto.class);
@@ -1412,6 +1413,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Date: 2022/4/21
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void courseAdjust(CourseAdjustVo adjustVo, Long teacherId) {
         Integer courseId = adjustVo.getCourseId();
         Date classDate = adjustVo.getClassDate();
@@ -1479,6 +1481,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         int feeTime = Integer.parseInt(String.valueOf(cn.hutool.core.date.DateUtil.between(schedule.getEndTime(), schedule.getFreeEndTime(), DateUnit.MINUTE)));
         Date freeEndTime = DateUtil.offsetMinute(endTime, feeTime);
         timeEntity.setFreeEndTime(freeEndTime);
+        adjustVo.setFreeEndTime(freeEndTime);
 
         List<CourseTimeEntity> timeList = Arrays.asList(timeEntity);
         //校验老师课程是否冲突

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

@@ -74,7 +74,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
         Student student = studentService.getById(orderDetailVo.getUserId());
         LocalDate startTime = LocalDate.now();
         if (student.getDiscountEndTime() != null && student.getDiscountEndTime().after(new Date())) {
-            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
+            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         }
         LocalDate endTime = LocalDate.now();
 
@@ -97,6 +97,9 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
             default:
                 log.error("时间类型错误{}", discountCardRecord.getType());
         }
+        if (startTime.isAfter(LocalDate.now())) {
+            startTime = startTime.plusDays(1);
+        }
         discountCardRecord.setStartTime(DateUtil.localDateTimeToDate(startTime.atTime(LocalTime.MIN)));
         discountCardRecord.setEndTime(DateUtil.localDateTimeToDate(endTime.atTime(23,59,59)));
 

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

@@ -317,6 +317,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateShelves(VideoLessonShelvesVo shelvesVo) {
         VideoLessonGroup videoLessonGroup = getById(shelvesVo.getId());
         if (videoLessonGroup.getDraftFlag() != null && videoLessonGroup.getDraftFlag().equals(YesOrNoEnum.YES)) {

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

@@ -28,6 +28,18 @@ public class CourseAdjustVo implements Serializable {
     @ApiModelProperty(value = "下课时间")
     private Date endTime;
 
+
+    @ApiModelProperty(value = "休息时长结束时间")
+    private Date freeEndTime;
+
+    public Date getFreeEndTime() {
+        return freeEndTime;
+    }
+
+    public void setFreeEndTime(Date freeEndTime) {
+        this.freeEndTime = freeEndTime;
+    }
+
     public Integer getCourseId() {
         return courseId;
     }

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

@@ -627,7 +627,7 @@
     </update>
     <update id="courseAdjust" parameterType="com.yonge.cooleshow.biz.dal.vo.CourseAdjustVo">
         UPDATE course_schedule
-        SET class_date_=#{classDate},start_time_=#{startTime},end_time_=#{endTime}
+        SET class_date_=#{classDate},start_time_=#{startTime},end_time_=#{endTime},free_end_time_=#{freeEndTime}
         WHERE id_ = #{courseId}
     </update>
     <select id="selectLive" resultType="com.yonge.cooleshow.biz.dal.vo.StudentHomePage$Live">