|
@@ -125,6 +125,14 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
if(organs.size()!=organIds.size()){
|
|
|
throw new BizException("合作单位信息错误");
|
|
|
}
|
|
|
+
|
|
|
+ SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
|
|
|
+ String baseUrl="";
|
|
|
+ if(Objects.nonNull(baseUrlConfig)){
|
|
|
+ baseUrl=baseUrlConfig.getParanValue();
|
|
|
+ }
|
|
|
+ baseUrl = baseUrl+"/#/signUp?";
|
|
|
+
|
|
|
Map<Integer, Organization> idOrganMap = organs.stream().collect(Collectors.toMap(Organization::getId, o -> o));
|
|
|
List<ExamOrganizationRelation> organizationRelations=new ArrayList<>();
|
|
|
for (Integer organId : organIds) {
|
|
@@ -146,6 +154,9 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
og.setTotalRegistrationStudentNum(BigDecimal.ZERO.intValue());
|
|
|
og.setTotalPaymentAmount(BigDecimal.ZERO);
|
|
|
og.setTotalTransAmount(BigDecimal.ZERO);
|
|
|
+ String registrationUrl = baseUrl + "examId=" + examId + "&organId=" + organId;
|
|
|
+ String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
|
|
|
+ og.setUrl(registShortUrl);
|
|
|
organizationRelations.add(og);
|
|
|
}
|
|
|
examOrganizationRelationDao.batchInsert(organizationRelations);
|
|
@@ -178,23 +189,13 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
throw new BizException("考级项目已关闭");
|
|
|
}
|
|
|
|
|
|
- SysConfig baseUrlConfig = sysConfigService.findByParamName(SysConfigService.BASE_API_URL);
|
|
|
- String baseUrl="";
|
|
|
- if(Objects.nonNull(baseUrlConfig)){
|
|
|
- baseUrl=baseUrlConfig.getParanValue();
|
|
|
- }
|
|
|
- baseUrl = baseUrl+"/#/signUp?";
|
|
|
-
|
|
|
List<ExamOrganizationRelation> needUpdate=new ArrayList<>();
|
|
|
for (ExamOrganizationRelation examOrgan : examOrgans) {
|
|
|
if(YesOrNoEnum.YES.equals(examOrgan.getSendUrlFlag())){
|
|
|
continue;
|
|
|
}
|
|
|
needUpdate.add(examOrgan);
|
|
|
- String registrationUrl = baseUrl + "examId=" + examOrgan.getExaminationBasicId() + "&organId=" + examOrgan.getOrganId();
|
|
|
- String registShortUrl = shortUrlService.createShortUrl(registrationUrl);
|
|
|
|
|
|
- examOrgan.setUrl(registShortUrl);
|
|
|
examOrgan.setSendUrlFlag(YesOrNoEnum.YES);
|
|
|
|
|
|
SysUser student = sysUserFeignService.queryUserById(examOrgan.getOrganId());
|
|
@@ -202,7 +203,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
|
|
|
userPhoneMap.put(examOrgan.getOrganId(), student.getPhone());
|
|
|
|
|
|
SysMessageParams sysMessageParams=new SysMessageParams(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.EXAM_REGISTRATION_URL_PUSH,
|
|
|
- userPhoneMap, null, 0, null, null, registShortUrl);
|
|
|
+ userPhoneMap, null, 0, null, null, examOrgan.getUrl());
|
|
|
sysMessageFeignService.batchSendMessage(sysMessageParams);
|
|
|
}
|
|
|
|