Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300
This commit is contained in:
commit
8f6f5aa168
@ -22,6 +22,7 @@ import cn.axzo.framework.domain.web.result.PageData;
|
||||
import cn.axzo.im.center.api.vo.PersonAccountAttribute;
|
||||
import cn.axzo.im.center.api.vo.req.GroupCreateRequest;
|
||||
import cn.axzo.im.center.api.vo.req.GroupDismissRequest;
|
||||
import cn.axzo.im.center.api.vo.req.SendChatMessageRequest;
|
||||
import cn.axzo.im.center.api.vo.resp.GroupCreateResponse;
|
||||
import cn.axzo.im.center.common.enums.AppTypeEnum;
|
||||
import cn.axzo.im.center.common.enums.GroupType;
|
||||
@ -1589,17 +1590,18 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
|
||||
changeRecordRelationService.clearImOperationParticipate(build);
|
||||
|
||||
// 重新发送卡片
|
||||
sendCardToImGroup(req, visa);
|
||||
sendCardAndMsgToImGroup(req, visa);
|
||||
}
|
||||
|
||||
private void sendCardToImGroup(ChangeRecordButtonOperationReq req, ChangeRecord visa) {
|
||||
private void sendCardAndMsgToImGroup(ChangeRecordButtonOperationReq req, ChangeRecord visa) {
|
||||
CardSendRequest cardRequest = new CardSendRequest();
|
||||
cardRequest.setAppCode(MSG_CENTER_APP_CODE);
|
||||
cardRequest.setTemplateCode(refreshableConfiguration.getImGroupCardTemplateCode());
|
||||
cardRequest.setBizCode(IM_GROUP_BIZ_INFO_VISA_ID + ":" + visa.getId());
|
||||
cardRequest.setSender(PeerPerson.create(req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId()));
|
||||
cardRequest.setImSenderAccountAppType(AppTypeEnum.CMP);
|
||||
cardRequest.setImReceiveAccounts(Sets.newHashSet(String.valueOf(visa.getImGroupId())));
|
||||
HashSet<String> imReceiveAccounts = Sets.newHashSet(String.valueOf(visa.getImGroupId()));
|
||||
cardRequest.setImReceiveAccounts(imReceiveAccounts);
|
||||
|
||||
OrganizationalUnitVO unitInfo = organizationalUnitGateway.getUnitInfo(req.getOperatorOuId());
|
||||
PersonProfileDto profile = visaProfileGateway.getProfile(req.getOperatorPersonId());
|
||||
@ -1613,6 +1615,19 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
|
||||
"amountChange", VisaHelper.buildChangeAmount(visa.getAmountChange())
|
||||
)));
|
||||
msgCenterGateway.sendCardToCroup(cardRequest);
|
||||
|
||||
// 普通群消息
|
||||
SendChatMessageRequest msgRequest = new SendChatMessageRequest();
|
||||
msgRequest.setAsTextMessage(visa.getTopic() + ",请各位审阅");
|
||||
msgRequest.setImReceiveAccounts(imReceiveAccounts);
|
||||
msgRequest.setSender(PersonAccountAttribute.builder()
|
||||
.personId(String.valueOf(req.getOperatorPersonId()))
|
||||
.ouId(req.getOperatorOuId())
|
||||
.workspaceId(req.getOperatorWorkspaceId())
|
||||
.appType(AppTypeEnum.CMP)
|
||||
.build());
|
||||
msgRequest.setBizId(IM_GROUP_BIZ_INFO_VISA_ID + ":" + visa.getId());
|
||||
msgCenterGateway.sendMsgToGroup(msgRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Loading…
Reference in New Issue
Block a user