1、vip课更新教学点时，去掉同一教学点判断

2、后台新增学员按折扣计算
3、兼容线下课程无教学点

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

@@ -116,11 +116,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (Objects.isNull(currentCourseDetail)) {
             throw new BizException("课程不存在");
         }
-        YesOrNoEnum yesOrNoEnum = enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
-                user.getId().longValue(),
-                true,
-                currentCourseDetail.getSchoolId().intValue());
-        currentCourseDetail.setOnlyNormal(yesOrNoEnum);
+        if(Objects.nonNull(currentCourseDetail.getSchoolId())){
+            YesOrNoEnum yesOrNoEnum = enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
+                    user.getId().longValue(),
+                    true,
+                    currentCourseDetail.getSchoolId().intValue());
+            currentCourseDetail.setOnlyNormal(yesOrNoEnum);
+        }else{
+            currentCourseDetail.setOnlyNormal(YesOrNoEnum.NO);
+        }
+
         currentCourseDetail.setCurrentClassTimes(courseScheduleDao.countClassGroupOverCourseNum(currentCourseDetail.getClassId()));
         SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE);
         currentCourseDetail.setEnableStudentAttendanceTimeRange(sysConfig.getParanValue(Integer.class));

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

@@ -155,10 +155,13 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				throw new BizException("该课程已结束，不能进行签到!");
 			}
 
-			YesOrNoEnum yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
-					user.getId().longValue(),
-					true,
-					currentCourseDetail.getSchoolId().intValue());
+			YesOrNoEnum yesOrNoEnum = YesOrNoEnum.NO;
+			if(Objects.nonNull(courseSchedule.getSchoolId())){
+				yesOrNoEnum = courseScheduleService.enableOnlyNormalAttendance(currentCourseDetail.getStartClassTime(),
+						user.getId().longValue(),
+						true,
+						currentCourseDetail.getSchoolId().intValue());
+			}
 			teacherAttendance.setSignInTime(date);
 			teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
 			result.put("signInStatus",0);

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

@@ -179,7 +179,7 @@
 		SELECT
             vg.*,
             vga.name_ vip_group_activity_name_,
-            su.username_
+            su.real_name_ username_
         FROM
             vip_group vg
             LEFT JOIN sys_user su ON vg.user_id_=su.id_

mec-education/src/main/java/com/ym/mec/education/service/impl/TeacherServiceImpl.java

@@ -82,7 +82,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public PageResponse teacherList(TeacherReq req) {
         PageResponse response = new PageResponse();
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        if (Objects.isNull(req.getUserId())) {
+        if (Objects.isNull(req)||Objects.isNull(req.getUserId())) {
             return PageResponse.errorParam();
         }
         Teacher teacher = getById(req.getUserId());
@@ -255,7 +255,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public PageResponse teacherVipClass(TeacherReq req) {
 
         PageResponse response = new PageResponse();
-        if (req == null && req.getUserId() == null) {
+        if (req == null || req.getUserId() == null) {
             return PageResponse.errorParam();
         }
 

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

@@ -96,7 +96,7 @@ public class StudentManageController extends BaseController {
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null && user.getId() != null){
+        if(user == null || user.getId() != null){
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -9,12 +9,13 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
 import com.ym.mec.util.upload.UploadUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -100,7 +101,7 @@ public class TeacherManageController extends BaseController {
     @GetMapping("userCashAccountDetail/queryPage")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if(user == null && user.getId() != null){
+        if(user == null || user.getId() != null){
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());

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

@@ -4,17 +4,13 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
 import com.ym.mec.biz.service.SysUserCashAccountDetailService;
 import com.ym.mec.common.controller.BaseController;
-
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +43,7 @@ public class SysUserCashAccountDetailController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('userCashAccountDetail/queryPage')")
     public Object queryPage(CashAccountDetail queryInfo) {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null && user.getId() != null) {
+        if (user == null || user.getId() != null) {
             return failed("请重新登录");
         }
         queryInfo.setUserId(user.getId());