From fa5076bcabdcbcd45e1c38e79c81b4c96c464c47 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Mon, 4 Nov 2024 11:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E5=BA=9F=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/iocoder/yudao/common/RecordTypeEnum.java | 8 +++++++-
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java  | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
index 7e43c8a0..92b4373b 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
@@ -64,7 +64,13 @@ public enum RecordTypeEnum {
     /**
      * 接单
      */
-    jd("jd","接单");
+    jd("jd","接单"),
+
+    /** 作废工单 */
+    ZFGG("zfgg", "作废工单"),
+
+    /** 删除工单 */
+    SCGG("scgg", "删除工单");
 
     /**
      * code
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 e7720842..f9cca09c 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
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.common.*;
 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
@@ -383,14 +384,21 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
 
     /**
      * 维修工单表 作废
+     * 传对象是因为需要有作废备注
      *
      * @param repairTicketsReqVO 工单对象
      * @author 小李
      * @date 19:46 2024/9/22
      **/
     @Override
+    @DSTransactional
     public void setTicketsVoid(DlRepairTicketsReqVO repairTicketsReqVO) {
+        // 作废维修工单
         baseMapper.updateById(repairTicketsReqVO);
+        // 删除订单
+        repairOrderInfoService.remove(new LambdaQueryWrapper<RepairOrderInfo>().eq(RepairOrderInfo::getGoodsId, repairTicketsReqVO.getId()));
+        // 记录日志
+        repairRecordsService.saveRepairRecord(repairTicketsReqVO.getId(), null, RecordTypeEnum.ZFGG.getCode(), repairTicketsReqVO.getRemark(), null);
     }
 
     /**