From e51d404fe9692aee36abf8ea68b573be30afbbb1 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 5 Nov 2024 17:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/iocoder/yudao/module/tickets/entity/Tickets.java   | 3 +++
 .../module/tickets/service/impl/TicketsServiceImpl.java   | 6 +++++-
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java  | 8 +++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/entity/Tickets.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/entity/Tickets.java
index 413620ff..8c9af228 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/entity/Tickets.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/entity/Tickets.java
@@ -177,4 +177,7 @@ public class Tickets extends TenantBaseDO {
 
     /** 工单进行状态 */
     private String ticketsWorkStatus;
+
+    /** 工单完成情况（0:未完成，1:已完成） */
+    private String isFinish;
 }
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/TicketsServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/TicketsServiceImpl.java
index b752a2a9..c7655f73 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/TicketsServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/TicketsServiceImpl.java
@@ -26,6 +26,10 @@ public class TicketsServiceImpl extends ServiceImpl<TicketsMapper, Tickets> impl
      **/
     @Override
     public void updateTickets(List<String> ticketIds){
-        baseMapper.update(new LambdaUpdateWrapper<Tickets>().in(Tickets::getId, ticketIds).set(Tickets::getTicketsStatus, "02"));
+        baseMapper.update(new LambdaUpdateWrapper<Tickets>()
+                .in(Tickets::getId, ticketIds)
+                .set(Tickets::getTicketsStatus, "02")
+                .set(Tickets::getIsFinish, "1")
+        );
     }
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 3a005657..43cf00c4 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -424,9 +424,11 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         repairOrderInfo.setPayType(repairTicketsRespVO.getPayType());
         repairOrderInfoService.updateById(repairOrderInfo);
         // 更新工单
-        // 在这里把工单的状态更新为已完成
-        repairTicketsRespVO.setIsFinish("1");
-        baseMapper.updateById(repairTicketsRespVO);
+        // 在这里把工单的状态更新为已完成---需要判断，如果是线上支付，需要在支付回调更新
+        if (!repairTicketsRespVO.getPayType().equals("01")){
+            repairTicketsRespVO.setIsFinish("1");
+            baseMapper.updateById(repairTicketsRespVO);
+        }
     }
 
     /**