Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

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

@@ -474,10 +474,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
 		//统计预计缴费人数
 		Map<Long, Long> expectNumMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.countExpectNum(id));
+		if(expectNumMap != null){
+			calender.setExpectNum(expectNumMap.get(id) == null ? 0 : expectNumMap.get(id).intValue());
+		}
 		//统计实际缴费人数
 		Map<Long, Long> actualNumMap = MapUtil.convertIntegerMap(musicGroupPaymentCalenderDao.countActualNum(id));
-		calender.setActualNum(actualNumMap.get(id) == null ? 0 : actualNumMap.get(id).intValue());
-		calender.setExpectNum(expectNumMap.get(id) == null ? 0 : expectNumMap.get(id).intValue());
+		if(actualNumMap != null){
+			calender.setActualNum(actualNumMap.get(id) == null ? 0 : actualNumMap.get(id).intValue());
+		}
 
 		if(calender.getOrganId() != null){
 			Organization organization = organizationDao.get(calender.getOrganId());
@@ -493,15 +497,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		result.put("sumActualAmount", sumActualAmount);
 		//进行中加学员
 		if(calender.getPaymentType() == ADD_STUDENT){
-			try {
-				String studentIds = calender.getStudentIds();
-				if(StringUtils.isNotEmpty(studentIds)){
-					SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(studentIds));
-					result.put("phone",sysUser.getPhone());
-					result.put("username",sysUser.getUsername());
-				}
-			}catch (Exception e){
-				e.printStackTrace();
+			String studentIds = calender.getStudentIds();
+			if(StringUtils.isNotEmpty(studentIds)){
+				SysUser sysUser = studentDao.getUser(Integer.parseInt(studentIds));
+				result.put("phone",sysUser.getPhone());
+				result.put("username",sysUser.getUsername());
 			}
 		}
 		//获取跨团合班学员缴费详情
@@ -1135,20 +1135,18 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		if (studentIds.size() > 0) {
 			String baseUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
-			String memo = "4?" + baseUrl + "/#/musicGroupRenew?calenderId="+calenderId+"&id=" + musicGroup.getId();
-			Map<Integer, String> push = new HashMap<>();
-			for (Integer userId : studentIds) {
-				push.put(userId, userId + "");
-			}
+			StringBuffer memo = new StringBuffer("4?").append(baseUrl).append("/#/musicGroupRenew?calenderId=").append(calenderId).append("&id=").append(musicGroup.getId());
+			Map<Integer, String> push = new HashMap<>(studentIds.size());
+			studentIds.forEach(e->push.put(e,e.toString()));
 			// 发送续费通知
 			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
-					null, 0, memo, "STUDENT", musicGroup.getName());
+					null, 0, memo.toString(), "STUDENT", musicGroup.getName());
 
 			//获取未缴费且不是0元的学员列表
 			Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calenderId,studentIds));
 			if(studentMaps.size() > 0){
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_WAIT_RENEW_MESSAGE, studentMaps,
-						null, 0, memo, null, musicGroup.getName());
+						null, 0, memo.toString(), null, musicGroup.getName());
 			}
 		}
 	}

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

@@ -37,13 +37,10 @@ public class TeacherAttendanceController extends BaseController {
 
     @Autowired
     private TeacherAttendanceService teacherAttendanceService;
-
     @Autowired
     private StudentAttendanceService studentAttendanceService;
-
     @Autowired
     private StudentAttendanceDao studentAttendanceDao;
-
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired
@@ -98,7 +95,7 @@ public class TeacherAttendanceController extends BaseController {
     @PostMapping("/studentAttendanceNormalRemind")
     public HttpResponseResult studentAttendanceNormalRemind(Long courseId){
         int remindNum = studentAttendanceDao.countNormalRemindNum(courseId);
-        if(remindNum>0){
+        if(remindNum > 0){
             return failed("您已发送过到课提醒");
         }
         CourseSchedule courseSchedule = courseScheduleService.get(courseId);
@@ -107,7 +104,6 @@ public class TeacherAttendanceController extends BaseController {
         if(CollectionUtils.isEmpty(studentAttendances)){
             return succeed();
         }
-
         List<StudentAttendance> normal = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.NORMAL).collect(Collectors.toList());
         //教务推送
         if(Objects.nonNull(courseSchedule)&& GroupType.MUSIC.equals(courseSchedule.getGroupType())){
@@ -116,7 +112,7 @@ public class TeacherAttendanceController extends BaseController {
                 int normalStudentNum = normal.size();
                 long leaveStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.LEAVE).count();
                 long truantStudentNum = studentAttendances.stream().filter(studentAttendance -> studentAttendance.getStatus() == StudentAttendanceStatusEnum.TRUANT).count();
-                Map<Integer, String> receivers = new HashMap<>();
+                Map<Integer, String> receivers = new HashMap<>(1);
                 receivers.put(musicGroup.getTransactionTeacherId(), musicGroup.getTransactionTeacherId().toString());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SYSTEM_PUSH_NAMES_ACHIEVE,
                         receivers, null, 0, null, "SYSTEM", courseSchedule.getName(), normalStudentNum, leaveStudentNum, truantStudentNum);
@@ -124,10 +120,8 @@ public class TeacherAttendanceController extends BaseController {
         }
 
         if (normal != null && normal.size() > 0) {
-            Map<Integer, String> receivers = new HashMap<>();
-            normal.forEach(e -> {
-                receivers.put(e.getUserId(), e.getUserId().toString());
-            });
+            Map<Integer, String> receivers = new HashMap<>(normal.size());
+            normal.forEach(e -> receivers.put(e.getUserId(), e.getUserId().toString()));
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_NAMES_ACHIEVE,
                     receivers, null, 0, "2", "STUDENT", DateUtil.format(new Date(), DateUtil.DATE_FORMAT_MIN));
         }else{