系统收费

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

@@ -836,8 +836,9 @@
         select su.id_ user_id_,su.username_,su.phone_,s.name_ subject_name_ from student_registration sr 
         LEFT JOIN sys_user su ON su.id_ = sr.user_id_
         LEFT JOIN `subject` s ON s.id_ = sr.actual_subject_id_
-        where sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND sr.user_id_ NOT IN (
-        SELECT DISTINCT mgpcd.user_id_ FROM music_group_payment_calender_detail mgpcd left join music_group_payment_calender mgpc on mgpcd.music_group_payment_calender_id_ = mgpc.id_
+        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL' AND sr.user_id_ NOT IN (
+        SELECT DISTINCT mgpcd.user_id_ FROM music_group_payment_calender_detail mgpcd
+        LEFT JOIN music_group_payment_calender mgpc on mgpcd.music_group_payment_calender_id_ = mgpc.id_
         WHERE mgpc.batch_no_ = #{batchNo} and mgpc.music_group_id_ = #{musicGroupId}
         )
         <if test="search != null and search != ''">

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -391,6 +391,9 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/queryRemainCourseTypeDuration")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryRemainCourseTypeDuration')")
     public HttpResponseResult queryRemainCourseTypeDuration(String classGroupIdList,Integer memberFlag) {
+        if(memberFlag == null){
+            memberFlag = 0;
+        }
         return succeed(classGroupService.queryRemainCourseTypeDuration(classGroupIdList,memberFlag));
     }