Merge branch 'feature/bug-528' into test

This commit is contained in:
曹鹏飞 2025-08-07 15:54:54 +08:00
commit 6d011e2731
1 changed files with 7 additions and 1 deletions

View File

@ -615,7 +615,13 @@ public class TicketController extends ControllerBase {
ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser);
}
}
if (ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true)) {
boolean flag;
if (StrUtil.equals(request.getFrom(), Constant.FROM_APP)) {
flag = ticketCallService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, request.getReject());
} else {
flag = ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, request.getReject());
}
if (flag) {
ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
}
return ApiResult.success();