|
@@ -595,28 +595,24 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
|
|
|
@Override
|
|
|
public void pushWaitRenewMessage(Long calenderId, String studentIds) {
|
|
|
List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.queryNoPaymentCanPushByCalenderId(calenderId,studentIds);
|
|
|
- if(calenderDetails == null){
|
|
|
+ if(calenderDetails == null || calenderDetails.size() == 0){
|
|
|
throw new BizException("发送失败:没有可以发送缴费提醒的学员");
|
|
|
}
|
|
|
MusicGroupPaymentCalender paymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
|
|
|
//未缴费
|
|
|
HashSet<String> strings = new HashSet<>(Arrays.asList(studentIds.split(",")));
|
|
|
Map<Integer,String> studentMaps = MapUtil.convertMybatisMap(musicGroupPaymentCalenderDetailDao.queryNoPaymentAndNotZeroStudent(calenderId,strings));
|
|
|
- if(studentMaps.size() > 0){
|
|
|
- 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);
|
|
|
- }
|
|
|
- // 发送续费通知
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
|
|
|
- null, 0, memo, "STUDENT", musicGroup.getName());
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_WAIT_RENEW_MESSAGE, studentMaps,
|
|
|
- null, 0, memo, null, musicGroup.getName());
|
|
|
- }else {
|
|
|
- throw new BizException("发送失败:没有待续费学员");
|
|
|
- }
|
|
|
+ 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);
|
|
|
+ }
|
|
|
+ // 发送续费通知
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
|
|
|
+ null, 0, memo, "STUDENT", musicGroup.getName());
|
|
|
+ sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.STUDENT_SMS_WAIT_RENEW_MESSAGE, studentMaps,
|
|
|
+ null, 0, memo, null, musicGroup.getName());
|
|
|
}
|
|
|
}
|