parent
1c64a30430
commit
54a5ad65b3
|
|
@ -569,9 +569,8 @@ public class TicketController extends ControllerBase {
|
|||
*/
|
||||
@PostMapping("call/hangUp")
|
||||
public ApiResult<Void> hangUp(@Valid @RequestBody TicketCallHangUpRequest request) {
|
||||
boolean flag=false;
|
||||
if (request.getReject()) {
|
||||
TicketCall ticketCall = ticketCallService.getLast(request.getTicketId());
|
||||
if (request.getReject()) {
|
||||
if (Objects.isNull(ticketCall)) return ApiResult.success();
|
||||
if (StrUtil.equals(request.getFrom(), Constant.FROM_APP) && Objects.equals(AppUserUtil.getUserId(), request.getFromUserId())) {
|
||||
AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
|
||||
|
|
@ -594,7 +593,6 @@ public class TicketController extends ControllerBase {
|
|||
)
|
||||
);
|
||||
ssePushService.sendTicketCallCancelToAdmin(request.getTicketId(), handlerId, appUser);
|
||||
flag = ticketCallService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
|
||||
} else {
|
||||
AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
|
||||
Ticket ticket = ticketService.getById(request.getTicketId());
|
||||
|
|
@ -615,10 +613,9 @@ public class TicketController extends ControllerBase {
|
|||
)
|
||||
);
|
||||
ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser);
|
||||
flag = ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
|
||||
}
|
||||
}
|
||||
if (flag){
|
||||
if (ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true)) {
|
||||
ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
|
||||
}
|
||||
return ApiResult.success();
|
||||
|
|
|
|||
Loading…
Reference in New Issue