Merge remote-tracking branch 'origin/master'

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/MusicGroupServiceImpl.java

@@ -1242,7 +1242,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
 			if (classGroupIdList != null && classGroupIdList.size() > 0) {
 				//更新班级人数
-				classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+				//classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
 
                 List<ImGroupModel> imGroupModels = new ArrayList<>();
                 ImGroupMember[] imGroupMember = {new ImGroupMember(userId.toString())};
@@ -1350,7 +1350,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		List<Integer> classGroupIdList = classGroupStudentMapperDao.queryClassGroupIdList(musicGroupId, userId, GroupType.MUSIC);
 		if (classGroupIdList != null && classGroupIdList.size() > 0) {
 			//更新班级人数
-			classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
+			//classGroupDao.batchUpdateStudentNumMinusOne(classGroupIdList);
 
 			//删除融云群
 			List<ImGroupModel> imGroupModels = new ArrayList<ImGroupModel>();

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

@@ -115,7 +115,7 @@ public class PayServiceImpl implements PayService {
             for (SysAccount account : accounts) {
                 Map<String, Object> routingList = new HashMap<>();
                 routingList.put("routingMerNo", account.getRoutingMerNo());//分佣账户
-                routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
+                routingList.put("routingFee", account.getRoutingFee().subtract((account.getRoutingFee().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
                 tempRoutingList.add(routingList);
             }
             if(accounts.size() ==1 && routingAccount.getMerNo().equals(routingAccount.getRoutingMerNo())){

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);
@@ -267,7 +270,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		Date classEndDateAdd60Minutes = DateUtil.addMinutes(classEndDateTime, 60);
 		Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
 //		Date add20Minutes = DateUtil.addMinutes(classStartDateTime, advanceSignMinutes * -1);
-		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
+//		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
 		//签到
 		if(teacherAttendance.getSignInTime() == null && SignStatusEnum.SIGN_IN.equals(signStatus)){
 			//是否连堂课
@@ -281,8 +284,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			boolean isSign = false;
 			if(yesOrNoEnum == YesOrNoEnum.YES){
 				isSign = true;
-			}else if(DateUtil.minutesBetween(add60Minutes,date) > 0 && DateUtil.minutesBetween(date,classStartDateTime) > 0){
-				//正常签到范围(开始前60分钟  ~  开始之前)
+			}else if(DateUtil.minutesBetween(date,classStartDateTime) > 0){
+				//正常签到范围(开始之前)
 				isSign = true;
 			}else if(DateUtil.minutesBetween(classStartDateTime,date) > 0){
 				//异常签到范围(开始之后)

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

@@ -207,7 +207,7 @@
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
 		LEFT JOIN sys_user su ON  su.id_ = sr.user_id_
-		WHERE sr.user_id_ = #{userId} AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
+		WHERE sr.user_id_ = #{userId} AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS') AND sr.music_group_status_ != 'QUIT'
 		ORDER BY mg.create_time_ DESC
 	</select>
 

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/CourseController.java

@@ -50,7 +50,7 @@ public class CourseController extends BaseController {
         if(null == groupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.get(groupId));
+        return succeed(classGroupService.findGroupById(groupId));
     }
 
     @ApiOperation(value = "分页获取学员购买记录")

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-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayUtil.java

@@ -44,7 +44,7 @@ public class YqPayUtil {
         List<Map> tempRoutingList = new ArrayList();
         Map<String, Object> routingList = new HashMap<>();
         routingList.put("routingMerNo", routingMerNo);//分佣账户
-        routingList.put("routingFee", amount.subtract((amount.multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
+        routingList.put("routingFee", amount.subtract((amount.multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP))); //分佣金额
         tempRoutingList.add(routingList);
 
         Map<String, Object> contentMap = new LinkedHashMap<>();

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

@@ -186,7 +186,7 @@ public class ExportController extends BaseController {
             if (row.getActualAmount() == null) {
                 row.setActualAmount(BigDecimal.ZERO);
             }
-            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal(0.28)).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal transferFee = (row.getActualAmount().multiply(new BigDecimal("0.28")).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_UP);
             row.setTransferFee(transferFee);
             BigDecimal musicalFee = BigDecimal.ZERO;
             BigDecimal teachingFee = BigDecimal.ZERO;

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());