Merge remote-tracking branch 'origin/master'

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

@@ -40,13 +40,15 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	boolean finishPreApply(String musicGroupId,boolean isCheckStudentNum);
-	
+
 	/**
 	 * 发送家长会通知
 	 * @param musicGroupId
+	 * @param meetingDate
+	 * @param address
 	 * @return
 	 */
-	boolean sendParentMeetingNotice(String musicGroupId);
+	boolean sendParentMeetingNotice(String musicGroupId, Date meetingDate, String address);
 
 	/**
 	 * 零星缴费

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

@@ -427,7 +427,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		String musicGroupId = studentPreRegistration.getMusicGroupId();
 
 		// 查询乐团状态
-		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
 		if (musicGroup == null) {
 			throw new BizException("乐团信息查询失败");
 		}
@@ -443,7 +443,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 		// 判断用户是否存在
 		SysUser user = sysUserFeignService.queryUserByMobile(studentPreRegistration.getPhone());
-		if (user.getId() == null) {
+		if (user == null || user.getId() == null) {
 			user = new SysUser();
 			user.setPhone(studentPreRegistration.getPhone());
 			user.setUsername(studentPreRegistration.getUserName());
@@ -498,7 +498,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	}
 
 	@Override
-	public boolean sendParentMeetingNotice(String musicGroupId) {
+	public boolean sendParentMeetingNotice(String musicGroupId, Date meetingDate, String address) {
 		MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
 		if (musicGroup == null) {
 			throw new BizException("乐团信息查询失败");
@@ -509,7 +509,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		List<StudentPreRegistration> studentPreRegistrationList = studentPreRegistrationDao.queryByMusicGroupId(musicGroupId);
 		Map<Integer,String> receiverList = studentPreRegistrationList.stream().collect(Collectors.toMap(StudentPreRegistration :: getUserId, StudentPreRegistration :: getPhone));
 		
-		sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.SMS_MUSIC_GROUP_PARENT_MEETING_NOTICE, receiverList, null, 1, null, null);
+		sysMessageService.batchSendMessage(MessageSender.AWSMS, MessageTypeEnum.SMS_MUSIC_GROUP_PARENT_MEETING_NOTICE, receiverList, null, 1, null, null, meetingDate, address);
 		return true;
 	}
 

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

@@ -319,8 +319,8 @@ public class MusicGroupController extends BaseController {
 	@ApiOperation(value = "发送家长会通知")
 	@PostMapping("/sendParentMeetingNotice")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/sendParentMeetingNotice')")
-	public HttpResponseResult<Boolean> sendParentMeetingNotice(String musicGroupId) {
-		return musicGroupService.sendParentMeetingNotice(musicGroupId) ? succeed() : failed();
+	public HttpResponseResult<Boolean> sendParentMeetingNotice(String musicGroupId, Date meetingDate, String address) {
+		return musicGroupService.sendParentMeetingNotice(musicGroupId, meetingDate, address) ? succeed() : failed();
 	}
 
 }