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:54:54 +08:00
parent 905284702c 3502560143
commit 6d011e2731
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,7 +615,13 @@ public class TicketController extends ControllerBase {
ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser); 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()); ticketEventPublisher.publishTicketCallEndEvent(request.getTicketId());
} }
return ApiResult.success(); return ApiResult.success();