add 教师课酬预警

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -394,9 +394,9 @@ public class StudentOrderController extends BaseController {
 
     @GetMapping("/teacherCourseStatistic")
     public HttpResponseResult teacherCourseStatistic() {
-        Date nowDate = new Date();
-        Date startDate = DateUtil.getFirstDayOfMonth(nowDate);
-        Date endDate = DateUtil.getLastDayOfMonth(nowDate);
+        Date nextMonthDate = DateUtil.addMonths(new Date(), 1);
+        Date startDate = DateUtil.getFirstDayOfMonth(nextMonthDate);
+        Date endDate = DateUtil.getLastDayOfMonth(nextMonthDate);
         BigDecimal salary = new BigDecimal("4000");
         List<TeacherCourseStatistics> teacherCourseStatisticsList = teacherCourseStatisticsDao.findUserByWarringSalary(startDate, endDate, salary);
         if(teacherCourseStatisticsList.size() ==0){
@@ -407,17 +407,27 @@ public class StudentOrderController extends BaseController {
         List<TeacherCourseStatistics> teCourseSalaryStatisAndTypes = teacherCourseStatisticsDao.findUserCourseSalaryByUserIds(userIds,startDate,endDate);
 
         for (TeacherCourseStatistics teacherCourseStatistics : teacherCourseStatisticsList) {
+            int vipCourseNum = 0;
+            int musicCourseNum =0;
+            BigDecimal expectVipCourseSalary = BigDecimal.ZERO;
+            BigDecimal expectMusicCourseSalary = BigDecimal.ZERO;
+
             for (TeacherCourseStatistics teCourseSalaryStatisAndType : teCourseSalaryStatisAndTypes) {
                 if(!teacherCourseStatistics.getUserId().equals(teCourseSalaryStatisAndType.getUserId())) continue;
 
                 if(teCourseSalaryStatisAndType.getGroupType().equals("VIP")){
-                    teacherCourseStatistics.setExpectVipCourseSalary(teCourseSalaryStatisAndType.getExpectTotalSalary());
-                    teacherCourseStatistics.setVipCourseNum(teCourseSalaryStatisAndType.getMusicCourseNum());
+                    expectVipCourseSalary = teCourseSalaryStatisAndType.getExpectTotalSalary();
+                    vipCourseNum = teCourseSalaryStatisAndType.getMusicCourseNum();
                 }else if(teCourseSalaryStatisAndType.getGroupType().equals("MUSIC")){
-                    teacherCourseStatistics.setExpectMusicCourseSalary(teCourseSalaryStatisAndType.getExpectTotalSalary());
-                    teacherCourseStatistics.setMusicCourseNum(teCourseSalaryStatisAndType.getMusicCourseNum());
+                    expectMusicCourseSalary = teCourseSalaryStatisAndType.getExpectTotalSalary();
+                    musicCourseNum = teCourseSalaryStatisAndType.getMusicCourseNum();
                 }
             }
+            teacherCourseStatistics.setExpectVipCourseSalary(expectVipCourseSalary);
+            teacherCourseStatistics.setExpectMusicCourseSalary(expectMusicCourseSalary);
+            teacherCourseStatistics.setVipCourseNum(vipCourseNum);
+            teacherCourseStatistics.setMusicCourseNum(musicCourseNum);
+
             if(teacherCourseStatistics.getSubjectIdList()==null){
                 teacherCourseStatistics.setSubjectIdList("");
             }