update 储备中、进行中 报名缴费去掉已上课的限制

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1692,7 +1692,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             if (regCalender != null && regCalender.getDeadlinePaymentDate() != null) {
                 musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
             }
-            if (musicGroup.getPaymentExpireDate() != null && DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
+
+            if (musicGroup.getPaymentExpireDate() != null && now.compareTo(DateUtil.getLastTimeWithDay(musicGroup.getPaymentExpireDate()))>0) {
                 return "乐团缴费时间已截止";
             }
         }
@@ -1708,10 +1709,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 return "乐团已建多批次缴费";
             }
 
-            Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
-            if (hasStartCourseNum != null && hasStartCourseNum > 0) {
-                return "乐团已开课";
-            }
+//            Integer hasStartCourseNum = courseScheduleDao.getMusicGroupHasStartCourseNum(musicGroup.getId());
+//            if (hasStartCourseNum != null && hasStartCourseNum > 0) {
+//                return "乐团已开课";
+//            }
         }
         return null;
     }
@@ -1730,12 +1731,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 viewMap.remove(musicGroupId);
             }
         });
-        List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
-        for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
-            if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
-                viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
-            }
-        }
+//        List<CourseSchedule> musicGroupsHasStartCourseNums = courseScheduleDao.getMusicGroupsHasStartCourseNum(ids);
+//        for (CourseSchedule musicGroupsHasStartCourseNum : musicGroupsHasStartCourseNums) {
+//            if(viewMap.containsKey(musicGroupsHasStartCourseNum.getMusicGroupId())){
+//                viewMap.remove(musicGroupsHasStartCourseNum.getMusicGroupId());
+//            }
+//        }
         return viewMap;
     }
 }

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -589,7 +589,7 @@
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND payment_type_='MUSIC_APPLY'
+        AND payment_type_='MUSIC_APPLY' AND batch_no_ IS NOT NULL
     </select>
 
     <select id="getMusicGroupCalenderBatchNoByIds" resultMap="MusicGroupPaymentCalender">
@@ -599,6 +599,7 @@
             #{id}
         </foreach>
         AND status_ IN ('AUDITING','NO', 'OPEN', 'OVER', 'PAID')
+        AND batch_no_ IS NOT NULL
         GROUP BY batch_no_
     </select>
 </mapper>