vip定制课

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AccountBizTypeEnum.java

@@ -11,7 +11,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
 
-    PRACTICE("陪练课"),
+    PRACTICE("趣纠课"),
     LIVE("直播课"),
     VIDEO("视频课"),
     MUSIC("乐谱购买"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CourseScheduleEnum.java

@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
  */
 public enum CourseScheduleEnum implements BaseEnum<String, CourseScheduleEnum> {
     //课程类型
-    PRACTICE("陪练课"),
+    PRACTICE("趣纠课"),
     LIVE("直播课"),
     PIANO_ROOM_CLASS("琴房课"),
     VIP("VIP课"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GoodTypeEnum.java

@@ -12,7 +12,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum GoodTypeEnum implements BaseEnum<String, GoodTypeEnum> {
     VIP("开通会员"),
     SVIP("开通会员 SVIP"),
-    PRACTICE("陪练课购买"),
+    PRACTICE("趣纠课购买"),
     LIVE("直播课购买"),
     VIDEO("视频课购买"),
     MUSIC("单曲点播"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageIconTypeEnum.java

@@ -12,7 +12,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
 public enum MessageIconTypeEnum implements BaseEnum<String, MessageIconTypeEnum> {
     TEACHER_AUTH("达人认证"),
     MUSICIAN_AUTH("音乐人认证"),
-    PRACTICE("陪练课"),
+    PRACTICE("趣纠课"),
     LIVE("直播课"),
     VIDEO("视频课"),
     MUSIC_SHEET("乐谱"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -44,8 +44,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     MUSICIAN_AUTH_FAIL("音乐人认证失败"),
     SMS_MUSICIAN_AUTH_FAIL("音乐人认证失败(短信)"),
 
-    STUDENT_BUY_PRACTICE("学员购买陪练课"),
-    SMS_STUDENT_BUY_PRACTICE("学员购买陪练课(短信)"),
+    STUDENT_BUY_PRACTICE("学员购买趣纠课"),
+    SMS_STUDENT_BUY_PRACTICE("学员购买趣纠课(短信)"),
     ARRANGE_PIANO_ROOM_CLASS("琴房课排课"),
 
     STUDENT_BUY_LIVE("学员购买直播课"),
@@ -53,10 +53,10 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     LIVE_COMPLETION_SUCCESS("直播课成课"),
     LIVE_COMPLETION_FAIL("直播课成课失败"),
     TOMORROW_COURSE_REMINDER("明日课程提醒（每晚9点）"),
-    STUDENT_PRACTICE_REMINDER("陪练课提醒（陪练课开始前20分钟）"),
+    STUDENT_PRACTICE_REMINDER("趣纠课提醒（趣纠课开始前20分钟）"),
     LIVE_REMINDER("直播课提醒（直播课开始前20分钟）"),
     COURSE_SETTLEMENT("课酬结算（每晚9点）"),
-    NOT_EVALUATE_STUDENT_PRACTICE("当日陪练课未评价/布置作业（每晚9点30，已评价/已布置不发）"),
+    NOT_EVALUATE_STUDENT_PRACTICE("当日趣纠课未评价/布置作业（每晚9点30，已评价/已布置不发）"),
     STUDENT_EVALUATE_TEACHER_PRACTICE("学员对老师评价"),
     WITHDRAWAL_SUCCESS("结算成功"),
     STUDENT_JOIN_FANSGROUP("学员申请加入粉丝群"),
@@ -79,8 +79,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     SMS_VIP_EXPIRE("VIP会员到期(短信)"),
     SMS_SVIP_EXPIRE("SVIP会员到期(短信)"),
 
-    PRACTICE_BUY("陪练课购买"),
-    SMS_PRACTICE_BUY("陪练课购买(短信)"),
+    PRACTICE_BUY("趣纠课购买"),
+    SMS_PRACTICE_BUY("趣纠课购买(短信)"),
 
     LIVE_BUY("直播课购买"),
     SMS_LIVE_BUY("直播课购买"),
@@ -89,9 +89,9 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     VIDEO_BUY("视频课购买"),
     SMS_VIDEO_BUY("视频课购买(短信)"),
 
-    PRACTICE_REMIND("陪练课提醒（陪练课开始前20分钟）"),
+    PRACTICE_REMIND("趣纠课提醒（趣纠课开始前20分钟）"),
     LIVE_REMIND("直播课提醒（直播课开始前20分钟）"),
-    NOT_EVALUATE_TEACHER_PRACTICE("当日陪练课未对老师评价（每晚9点，已评价不发）"),
+    NOT_EVALUATE_TEACHER_PRACTICE("当日趣纠课未对老师评价（每晚9点，已评价不发）"),
     FANSGROUP_APPLY_SUCCESS("粉丝群申请通过"),
 
     TEACHER_STYLE_VIDEO_SUCCESS("个人风采审核通过"),
@@ -115,7 +115,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
     PIANO_ROOM_TIMES_SUB("扣除琴房时长通知"),
 
     PIANO_ROOM_ADJUST("琴房课调整"),
-    PRACTICE_ADJUST("陪练课调整"),
+    PRACTICE_ADJUST("趣纠课调整"),
     ACTIVITY_WIN("获奖消息"),
     PLATFORM_ADD_VIP("会员赠送"),
     PLATFORM_ADD_SVIP("会员赠送"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/RoomTypeEnum.java

@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
 public enum RoomTypeEnum {
 
     LIVE("直播课"),
-    PRACTICE("陪练课"),
+    PRACTICE("趣纠课"),
     TEMP("临时直播间");
 
     private final String code;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/course/CourseTypeEnum.java

@@ -10,7 +10,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum CourseTypeEnum implements BaseEnum<String, CourseTypeEnum> {
 
-    PRACTICE("陪练课"),
+    PRACTICE("趣纠课"),
     LIVE("直播课"),
     PIANO_ROOM_CLASS("琴房课"),
     VIDEO("视频课"),

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

@@ -919,19 +919,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      */
     @Override
     public PageInfo<CourseStudent> queryStudentLiveCourse(Map<String, Object> param) {
-        String classDate = WrapperUtil.toStr(param, "classDate");
-        String[] classDateSp = classDate.split("-");
-        LocalDate firstDay;
-        try {
-            firstDay = LocalDate.of(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1);
-        } catch (Exception e) {
-            throw new BizException("查询时间格式不正确 [" + classDate + "]");
-        }
         //本月的最后一天
-        LocalDate lastDay = firstDay.with(TemporalAdjusters.lastDayOfMonth());
         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_");

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

@@ -570,8 +570,6 @@
         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>