|
|
@@ -237,77 +237,6 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
|
|
|
"STUDENT",memberName,pushMemberRenewAgain);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- /*Date date = new Date();
|
|
|
- //会员结束前15天自动创建乐团续费（默认提前15天）
|
|
|
- String autoCreateMemberRenew = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_CREATE_MEMBER_RENEW,tenantId);
|
|
|
- if(StringUtils.isNotEmpty(autoCreateMemberRenew)){
|
|
|
- Map<String,String> studentMusicMap = MapUtil.convertMybatisMap(studentRegistrationDao.queryAutoCreateStudentMap(autoCreateMemberRenew, tenantId));
|
|
|
- if(studentMusicMap.size() > 0){
|
|
|
- for (String musicGroupId : studentMusicMap.keySet()) {
|
|
|
- MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
- MemberFeeSetting memberFee = memberFeeSettingDao.findByRankIdAndOrganId(musicGroup.getOrganId(), memberRankSetting.getId());
|
|
|
- if(memberFee == null){
|
|
|
- Organization organization = organizationDao.get(musicGroup.getOrganId());
|
|
|
- logger.error("自动创建缴费项目失败，{} 分部会员收费标准未配置",organization.getName());
|
|
|
- continue;
|
|
|
- }
|
|
|
- //创建缴费项目
|
|
|
- MusicGroupPaymentCalenderDto musicGroupPaymentCalenderDto = new MusicGroupPaymentCalenderDto();
|
|
|
- musicGroupPaymentCalenderDto.setMusicGroupId(musicGroupId);
|
|
|
- musicGroupPaymentCalenderDto.setMemberValidDate(6);
|
|
|
- musicGroupPaymentCalenderDto.setMemo("系统自动创建缴费项目");
|
|
|
- musicGroupPaymentCalenderDto.setMemberRankSettingId(memberRankSetting.getId());
|
|
|
- musicGroupPaymentCalenderDto.setPayUserType(MusicGroupPaymentCalender.PayUserType.STUDENT);
|
|
|
- musicGroupPaymentCalenderDto.setPaymentType(MusicGroupPaymentCalender.PaymentType.MUSIC_RENEW);
|
|
|
- musicGroupPaymentCalenderDto.setPaymentPattern(1);
|
|
|
- musicGroupPaymentCalenderDto.setMemberPaymentAmount(memberFee.getGroupPurchaseHalfYearFee().setScale(0, BigDecimal.ROUND_HALF_UP));
|
|
|
- musicGroupPaymentCalenderDto.setAutoCreate(true);
|
|
|
- musicGroupPaymentCalenderDto.setIsGiveMusicNetwork(false);
|
|
|
- List<MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange> musicGroupPaymentDateRangeList = new ArrayList<>();
|
|
|
- MusicGroupPaymentCalenderDto.MusicGroupPaymentDateRange range = new MusicGroupPaymentCalenderDto().new MusicGroupPaymentDateRange();
|
|
|
- range.setStartPaymentDate(date);
|
|
|
- range.setDeadlinePaymentDate(DateUtil.addMonths(date,1));
|
|
|
- musicGroupPaymentDateRangeList.add(range);
|
|
|
- musicGroupPaymentCalenderDto.setMusicGroupPaymentDateRangeList(musicGroupPaymentDateRangeList);
|
|
|
- String batchNo = "";
|
|
|
- try {
|
|
|
- batchNo = musicGroupPaymentCalenderService.create(musicGroupPaymentCalenderDto);
|
|
|
- }catch (Exception e){
|
|
|
- logger.error("{} 乐团自动创建缴费项目失败，失败原因:{}",musicGroup.getName(),e.getMessage());
|
|
|
- continue;
|
|
|
- }
|
|
|
- MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.findByBatchNo(batchNo).get(0);
|
|
|
- Set<Integer> userIdList = Arrays.stream(studentMusicMap.get(musicGroupId).split(",")).map(Integer::new).collect(Collectors.toSet());
|
|
|
- musicGroupPaymentCalenderDetailService.batchAdd(calender.getId(),userIdList,musicGroup,true);
|
|
|
- Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(studentMusicMap.get(musicGroupId)));
|
|
|
- Map<Integer,String> userMap = new HashMap<>(userIdList.size());
|
|
|
- Map<Integer,String> userMap1 = new HashMap<>(userIdList.size());
|
|
|
- for (Integer studentId : userIdList) {
|
|
|
- userMap.put(studentId,studentPhoneMap.get(studentId));
|
|
|
- userMap1.put(studentId,studentId.toString());
|
|
|
- }
|
|
|
- String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
|
|
|
- String pushUrl = baseApiUrl + "/#/musicGroupRenew?calenderId=" + calender.getId() + "&id=" + musicGroupId;
|
|
|
- String sortUrl = HttpUtil.getSortUrl(pushUrl);
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
|
|
|
- MessageTypeEnum.SMS_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,
|
|
|
- userMap,
|
|
|
- null,
|
|
|
- 0,
|
|
|
- sortUrl,
|
|
|
- null,memberName,autoCreateMemberRenew,sortUrl);
|
|
|
-
|
|
|
- sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
|
|
|
- MessageTypeEnum.PUSH_AUTO_STUDENT_MEMBER_RENEW_MESSAGE,
|
|
|
- userMap1,
|
|
|
- null,
|
|
|
- 0,
|
|
|
- "4?" + pushUrl,
|
|
|
- "STUDENT",memberName,autoCreateMemberRenew);
|
|
|
- }
|
|
|
- }
|
|
|
- }*/
|
|
|
}
|
|
|
|
|
|
private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){
|
zouxuan