Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -27,7 +27,8 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 			String phone = authentication.getPrincipal().toString();
 
 			// 验证码验证
-			smsCodeService.verifyValidCode(StringUtils.substringAfter(phone, SecurityConstants.PHONE_PRINCIPAL_PREFIX), smsCode);
+			boolean b = smsCodeService.verifyValidCode(StringUtils.substringAfter(phone, SecurityConstants.PHONE_PRINCIPAL_PREFIX), smsCode);
+			if(!b) throw new BadCredentialsException("验证码校验失败");
 		}
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -16,15 +16,24 @@ import java.util.Map;
 public interface VipGroupService extends BaseService<Long, VipGroup> {
 
     /**
-     * @Author: Joburgess
-     * @Date: 2019/10/3
-     * @params [vipGroup]
-     * @return void
      * @describe 创建vip课
+     * @author Joburgess
+     * @date 2019/10/30
+     * @param vipGroup: VIP课申请信息
+     * @return void
      */
     void createVipGroup(VipGroupApplyDto vipGroup);
 
     /**
+     * @describe 更新vip课程信息
+     * @author Joburgess
+     * @date 2019/10/30
+     * @param vipGroupApplyInfo: vip课信息
+     * @return void
+     */
+    void updateVipGroup(VipGroupApplyDto vipGroupApplyInfo);
+
+    /**
      * @describe vip课程审核
      * @author Joburgess
      * @date 2019/10/22

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

@@ -474,7 +474,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public List<ImGroupModel> queryUserGroups(Integer userId, String search) {
-        List<ImGroupModel> imGroupModels = musicGroupDao.queryUserGroups(userId, search);
+        /*List<ImGroupModel> imGroupModels = musicGroupDao.queryUserGroups(userId, search);
 
         if (imGroupModels != null && imGroupModels.size() > 0) {
             //获取相关的所有乐团
@@ -501,18 +501,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         } else {
             imGroupModels = new ArrayList<>();
-        }
-        List<ImGroupModel> imGroupModels1 = classGroupDao.queryUserGroups(userId, search);
-        if (imGroupModels1 != null && imGroupModels1.size() > 0) {
-            Set<String> classGroupIds = imGroupModels1.stream().map(e -> e.getId()).collect(Collectors.toSet());
+        }*/
+        List<ImGroupModel> imGroupModels = classGroupDao.queryUserGroups(userId, search);
+        if (imGroupModels != null && imGroupModels.size() > 0) {
+            Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
             //获取班级老师总数map
             List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ","));
             Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
-            imGroupModels1.forEach(e -> {
+            imGroupModels.forEach(e -> {
                 Integer num = numsMap.get(e.getId());
                 e.setCount(num == null ? 0 : num + e.getCount());
             });
-            imGroupModels.addAll(imGroupModels1);
+//            imGroupModels.addAll(imGroupModels1);
         }
         return imGroupModels;
     }

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

@@ -49,8 +49,6 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Autowired
 	private SysUserCashAccountDao sysUserCashAccountDao;
 	@Autowired
-	private ContractService contractService;
-	@Autowired
 	private SysConfigDao sysConfigDao;
 
 	@Override
@@ -88,11 +86,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
-		contractService.register(employee.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+//		contractService.register(employee.getId(), employee.getRealName(), employee.getIdCardNo(), employee.getPhone());
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),
 				StringUtils.isEmpty(employee.getAvatar())?sysConfigDao.findByParamName("user_default_head_url").getParanValue():employee.getAvatar()));
 		employee.setImToken(imResult.getToken());
 		employeeDao.update(employee);
+		teacherDao.updateUser(employee);
 	}
 
 	@Override

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

@@ -30,13 +30,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 	}
 
 	@Override
-	public boolean sendValidCode(String mobile) throws Exception {
-//		String code = RandomStringUtils.randomNumeric(6);
-		String code = "123456";
-		// 发送验证码
-//		SysMessageConfig messageConfig = sysMessageConfigDao.get(1);
-//		String content = String.format(messageConfig.getContent(), code);
-//		messageSenderPluginContext.send(MessageSenderPluginContext.MessageSender.YIMEI,"",content,mobile,"");
+	public boolean sendValidCode(String mobile){
 		//保存发送记录
 		SysUser sysUser = sysUserFeignService.queryUserByMobile(mobile);
 		Integer userId = null;
@@ -44,8 +38,6 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 			userId = sysUser.getId();
 		}
 		sysMessageService.sendSecurityCode(MessageSenderPluginContext.MessageSender.YIMEI,userId, MessageTypeEnum.SMS_VERIFY_CODE_LOGIN,mobile);
-//		sysMessageService.insert(new SysMessage("",content, MessageSendMode.SMS,mobile,userId,""));
-//		redisCache.put(loginVerifyCodeKey + mobile, code, expireTime);
 		return true;
 	}
 

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

@@ -6,7 +6,6 @@ import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.School;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.Teacher;
@@ -43,8 +42,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Autowired
 	private SubjectDao subjectDao;
 	@Autowired
-	private MusicGroupDao musicGroupDao;
-	@Autowired
 	private ClassGroupDao classGroupDao;
 	@Autowired
 	private DemoGroupDao demoGroupDao;
@@ -126,7 +123,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Override
 	public List<ImGroupModel> queryTeacherGroups(Integer userId,String search) {
 		//获取教师所在乐团列表
-		List<ImGroupModel> imGroupModels =  musicGroupDao.queryTeacherGroups(userId,search);
+		/*List<ImGroupModel> imGroupModels =  musicGroupDao.queryTeacherGroups(userId,search);
 
 		if(imGroupModels != null && imGroupModels.size() > 0){
 			//获取乐团id列表
@@ -151,21 +148,21 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			});
 		}else {
 			imGroupModels = new ArrayList<>();
-		}
+		}*/
 		//获取教师所在班级列表
-		List<ImGroupModel> imGroupModels1 =  classGroupDao.queryTeacherGroups(userId,search);
-		if(imGroupModels1 != null && imGroupModels1.size() > 0){
-			Set<String> classGroupIds = imGroupModels1.stream().map(e -> e.getId()).collect(Collectors.toSet());
+		List<ImGroupModel> imGroupModels =  classGroupDao.queryTeacherGroups(userId,search);
+		if(imGroupModels != null && imGroupModels.size() > 0){
+			Set<String> classGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			//获取班级老师总数map
 			List<Map<Integer, Integer>> nums = classGroupDao.countTeacherNums(StringUtils.join(classGroupIds,","));
 			Map<Integer, Integer> numsMap = MapUtil.convertMybatisMap(nums);
-			imGroupModels1.forEach(e -> {
+			imGroupModels.forEach(e -> {
 				//获取当前班级老师总数
 				Integer num = numsMap.get(e.getId());
 				e.setCount(num == null?0:num + e.getCount());
-				e.setId("cg" + e.getId());
+//				e.setId("cg" + e.getId());
 			});
-			imGroupModels.addAll(imGroupModels1);
+//			imGroupModels.addAll(imGroupModels1);
 		}
 
 		return imGroupModels;

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

@@ -255,7 +255,16 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateVipGroup(VipGroupApplyDto vipGroupApplyInfo) {
+		VipGroupApplyBaseInfoDto vipGroupUpdateInfo = vipGroupApplyInfo.getVipGroupApplyBaseInfo();
+		if(Objects.isNull(vipGroupUpdateInfo.getId())){
+			throw new BizException("请指定vip课");
+		}
+		VipGroup oldVipGroupInfo = vipGroupDao.get(vipGroupUpdateInfo.getId());
 
+	}
 
 	@Override
 	public void vipApplyAudit(Long vipGroupId, AuditStatusEnum auditStatus, String reason) {

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

@@ -248,7 +248,7 @@
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
         actual_subject_name_,sr.parents_phone_,sr.payment_status_
         FROM student_registration sr
-        LEFT JOIN sys_user su ON sr.subject_id_ = su.id_
+        LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_
         LEFT JOIN `subject` ss ON sr.actual_subject_id_ = ss.id_
         <include refid="queryStudentDetailPageSql"/>

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/RedisIdGeneratorService.java

@@ -94,7 +94,7 @@ public class RedisIdGeneratorService implements IdGeneratorService {
 		if(StringUtils.isNoneEmpty(verifyCode) && StringUtils.equalsIgnoreCase(verifyCode,authCode)){
 			return true;
 		}
-		return true;
+		return false;
 	}
 	
 }

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

@@ -4,7 +4,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
@@ -24,8 +23,6 @@ public class CourseController extends BaseController {
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
-    private MusicGroupService musicGroupService;
-    @Autowired
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("获取学生所购买课程列表")
@@ -54,12 +51,7 @@ public class CourseController extends BaseController {
         if(StringUtils.isEmpty(groupId)){
             return failed("参数校验错误");
         }
-        if(groupId.startsWith("mg")){
-            return succeed(musicGroupService.get(groupId.substring(2)));
-        }else if(groupId.startsWith("cg")){
-            return succeed(classGroupService.get(Integer.parseInt(groupId.substring(2))));
-        }
-        return failed("群编号不存在");
+        return succeed(classGroupService.get(Integer.parseInt(groupId.substring(2))));
     }
 
     @ApiOperation(value = "分页获取学员购买记录")

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

@@ -1,6 +1,5 @@
 package com.ym.mec.teacher.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
@@ -60,7 +59,6 @@ public class TeacherCourseScheduleController extends BaseController {
         if(null==user){
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        System.out.println(JSON.toJSONString(user));
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherCourseSchedulesWithDate(user.getId(),date,type);
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);