From 1c64a3043075f11fc7543ee0839fcda07e1f410d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 7 Aug 2025 15:17:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-528=20app=E7=AB=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A7=86=E9=A2=91=E9=80=9A=E8=AF=9D=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cfs/controller/TicketController.java         |  6 ++++--
 .../repository/service/ITicketCallService.java   |  2 ++
 .../service/impl/TicketCallJoinServiceImpl.java  |  7 ++-----
 .../service/impl/TicketCallServiceImpl.java      | 16 +++++++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
index 739f072d..097e6588 100644
--- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
+++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TicketController.java
@@ -571,6 +571,8 @@ public class TicketController extends ControllerBase {
     public ApiResult<Void> hangUp(@Valid @RequestBody TicketCallHangUpRequest request) {
         boolean flag=false;
         if (request.getReject()) {
+            TicketCall ticketCall = ticketCallService.getLast(request.getTicketId());
+            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());
                 Ticket ticket = ticketService.getById(request.getTicketId());
@@ -592,7 +594,7 @@ public class TicketController extends ControllerBase {
                         )
                 );
                 ssePushService.sendTicketCallCancelToAdmin(request.getTicketId(), handlerId, appUser);
-                flag=ticketCallService.hangUp(request.getTicketId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
+                flag = ticketCallService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
             }else {
                 AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
                 Ticket ticket = ticketService.getById(request.getTicketId());
@@ -613,7 +615,7 @@ public class TicketController extends ControllerBase {
                         )
                 );
                 ssePushService.sendTicketCallHangUpToAdmin(request.getTicketId(), request.getFromUserId(), appUser);
-                flag=ticketCallJoinService.hangUp(request.getTicketId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
+                flag = ticketCallJoinService.hangUp(ticketCall.getId(), AppUserUtil.getUserId(), Constant.FROM_APP, true);
             }
         }
         if (flag){
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java
index f5a8f05d..e7c7eb77 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketCallService.java
@@ -20,4 +20,6 @@ public interface ITicketCallService extends IService<TicketCall> {
     void add(Integer ticketId, Integer callerUserId,String callerUserFrom, Integer calledUserId, String calledUserFrom);
 
     boolean hangUp(@NotNull Integer ticketId, Integer userId, String from, boolean reject);
+
+    TicketCall getLast(@NotNull Integer ticketId);
 }
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java
index 1e463ea0..86850abe 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallJoinServiceImpl.java
@@ -38,11 +38,7 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
     @Transactional
     @Override
     public void join(Integer ticketId, Integer userId, String from) {
-        TicketCall ticketCall = ticketCallService.lambdaQuery()
-                .eq(TicketCall::getTicketId, ticketId)
-                .ne(TicketCall::getState, 2)
-                .last("limit 1")
-                .one();
+        TicketCall ticketCall = ticketCallService.getLast(ticketId);
         VUtils.trueThrowBusinessError(Objects.isNull(ticketCall)).throwMessage("加入失败,通话已结束");
         TicketCallJoin ticketCallJoin = lambdaQuery()
                 .eq(TicketCallJoin::getCallId, ticketCall.getId())
@@ -73,6 +69,7 @@ public class TicketCallJoinServiceImpl extends ServiceImpl<TicketCallJoinMapper,
                 .ne(TicketCallJoin::getState, 2)
                 .eq(TicketCallJoin::getUserId, userId)
                 .eq(TicketCallJoin::getFrom, from)
+                .orderByDesc(TicketCallJoin::getId)
                 .last("limit 1")
                 .one();
         boolean flag = false;
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java
index 1efc5955..6c48ee36 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketCallServiceImpl.java
@@ -60,11 +60,7 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
 
     @Override
     public boolean hangUp(Integer ticketId, Integer userId, String from, boolean reject) {
-        TicketCall ticketCall = lambdaQuery()
-                .eq(TicketCall::getTicketId, ticketId)
-                .ne(TicketCall::getState, 2)
-                .last("limit 1")
-                .one();
+        TicketCall ticketCall = getLast(ticketId);
         boolean flag = false;
         if (Objects.nonNull(ticketCall)){
             if ((Objects.equals(ticketCall.getCallerUserId(), userId) && StrUtil.equals(ticketCall.getFrom(), Constant.FROM_APP))
@@ -80,4 +76,14 @@ public class TicketCallServiceImpl extends ServiceImpl<TicketCallMapper, TicketC
         }
         return flag;
     }
+
+    @Override
+    public TicketCall getLast(Integer ticketId) {
+        return lambdaQuery()
+                .eq(TicketCall::getTicketId, ticketId)
+                .ne(TicketCall::getState, 2)
+                .orderByDesc(TicketCall::getId)
+                .last("limit 1")
+                .one();
+    }
 }
\ No newline at end of file