rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-528' into test

This commit is contained in:
曹鹏飞 2025-08-07 15:41:14 +08:00
parent e65d8f9fc1 54a5ad65b3
commit 905284702c
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
View File

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