cy 3 gadi atpakaļ
vecāks
revīzija
6063612afc

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

@@ -1251,7 +1251,23 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      * @Date: 2022/4/26
      */
     public List<TeacherSubjectPrice> teacherSubjectPrice(Long teacherId) {
-        return teacherFreeTimeDao.selectPriceByTeacherId(teacherId);
+        TeacherFreeTime teacherFreeTime = teacherFreeTimeDao.selectOne(Wrappers.<TeacherFreeTime>lambdaQuery()
+                .eq(TeacherFreeTime::getTeacherId, teacherId)
+                .eq(TeacherFreeTime::getEnableFlag, 1)
+                .eq(TeacherFreeTime::getDefaultFlag, 1));
+
+        if ((teacherFreeTime.getMonday() == null || teacherFreeTime.getMonday().equals("[]")) &&
+                (teacherFreeTime.getThursday() == null || teacherFreeTime.getThursday().equals("[]")) &&
+                (teacherFreeTime.getWednesday() == null || teacherFreeTime.getWednesday().equals("[]")) &&
+                (teacherFreeTime.getThursday() == null || teacherFreeTime.getThursday().equals("[]")) &&
+                (teacherFreeTime.getFriday() == null || teacherFreeTime.getFriday().equals("[]")) &&
+                (teacherFreeTime.getSaturday() == null || teacherFreeTime.getSaturday().equals("[]")) &&
+                (teacherFreeTime.getSunday() == null || teacherFreeTime.getSunday().equals("[]"))) {
+            return new ArrayList<>();
+        }
+
+        List<TeacherSubjectPrice> list = teacherFreeTimeDao.selectPriceByTeacherId(teacherId);
+        return list;
     }
 
     @Override
@@ -1841,8 +1857,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 payment.setUserId(studentId);
                 payment.setCourseType(CourseScheduleEnum.PIANO_ROOM_CLASS.getCode());
                 courseScheduleStudentPaymentService.save(payment);
-
-                pianoSend(teacherId, studentId);
             }
         }
 
@@ -1863,6 +1877,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         //清除统计缓存
         for (Long studentId : studentIds) {
             redissonClient.getBucket(CacheNameEnum.STUDENT_TOTAL.getRedisKey(studentId)).delete();
+            pianoSend(teacherId, studentId);
         }
         redissonClient.getBucket(CacheNameEnum.TEACHER_TOTAL.getRedisKey(teacherId)).delete();
     }

+ 1 - 8
cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherFreeTimeMapper.xml

@@ -107,17 +107,10 @@
             p.subject_name_ AS subjectName,
             p.subject_price_ AS subjectPrice
         FROM teacher_free_time f
-                 LEFT JOIN teacher_subject_price p ON f.id_=p.teacher_free_time_id
+        LEFT JOIN teacher_subject_price p ON f.id_=p.teacher_free_time_id
         WHERE f.teacher_id_=#{teacherId}
         AND f.default_flag_=1
         AND f.enable_flag_=1
-        AND f.monday_ IS NOT NULL
-        AND f.tuesday_ IS NOT NULL
-        AND f.wednesday_ IS NOT NULL
-        AND f.thursday_ IS NOT NULL
-        AND f.friday_ IS NOT NULL
-        AND f.saturday_ IS NOT NULL
-        AND f.sunday_ IS NOT NULL
     </select>
     <select id="getTeacherFreeTime" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime">
         SELECT * FROM teacher_free_time WHERE default_flag_=1