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

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

@@ -107,9 +107,9 @@ public interface MusicGroupPaymentCalenderDetailService extends BaseService<Long
 
     /**
      * 主动发送学员待续费通知
-     * @param calenderDetailId
+     * @param calenderId
      * @param studentIds
      * @return
      */
-    void pushWaitRenewMessage(Long calenderDetailId, String studentIds);
+    void pushWaitRenewMessage(Long calenderId, String studentIds);
 }

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

@@ -615,16 +615,16 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		if(calenderDetails == null || calenderDetails.size() == 0){
 			throw new BizException("发送失败：没有可以发送缴费提醒的学员");
 		}
+		Set<Integer> studentIdList = calenderDetails.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
 		MusicGroupPaymentCalender paymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
 		//未缴费
-		HashSet<String> strings = new HashSet<>(Arrays.asList(studentIds.split(",")));
-		Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calenderId,strings));
+		Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calenderId,studentIdList));
 		MusicGroup musicGroup = musicGroupDao.get(paymentCalender.getMusicGroupId());
 		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 (String userId : strings) {
-			push.put(Integer.parseInt(userId), userId);
+		for (Integer userId : studentIdList) {
+			push.put(userId, userId.toString());
 		}
 		// 发送续费通知
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,

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

@@ -109,8 +109,8 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
     @ApiOperation(value = "发送学员待续费通知")
     @PostMapping("/sendWaitRenewMessage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/sendWaitRenewMessage')")
-    public HttpResponseResult sendWaitRenewMessage(Long calenderDetailId, String studentIds) {
-        musicGroupPaymentCalenderDetailService.pushWaitRenewMessage(calenderDetailId,studentIds);
+    public HttpResponseResult sendWaitRenewMessage(Long calenderId, String studentIds) {
+        musicGroupPaymentCalenderDetailService.pushWaitRenewMessage(calenderId,studentIds);
         return succeed();
     }