From 883f5e73fbe7458fd760dbe8560dd5d8757e04cd Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 13:56:29 +0800
Subject: [PATCH] refactor: 按需求表收敛范围,撤销非需求模块,补齐售后回访闭环

---
 yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
index a076b58..09d3c68 100644
--- a/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
+++ b/yudao-module-aftersales/src/main/java/cn/iocoder/yudao/module/aftersales/service/ticket/AfterSaleTicketServiceImpl.java
@@ -6,6 +6,9 @@
 import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketPageReqVO;
 import cn.iocoder.yudao.module.aftersales.controller.admin.ticket.vo.ticket.AfterSaleTicketSaveReqVO;
 import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketDO;
+import cn.iocoder.yudao.module.aftersales.dal.dataobject.returnobj.AfterSaleReturnDO;
+import cn.iocoder.yudao.module.aftersales.dal.mysql.returnobj.AfterSaleReturnMapper;
+import cn.iocoder.yudao.module.aftersales.enums.AfterSaleReturnStatusEnum;
 import cn.iocoder.yudao.module.aftersales.dal.dataobject.ticket.AfterSaleTicketItemDO;
 import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketItemMapper;
 import cn.iocoder.yudao.module.aftersales.dal.mysql.ticket.AfterSaleTicketMapper;
@@ -15,6 +18,7 @@
 import cn.iocoder.yudao.module.aftersales.enums.permission.AfterSalePermissionLevelEnum;
 import cn.iocoder.yudao.module.aftersales.service.permission.AfterSalePermissionService;
 import cn.iocoder.yudao.module.aftersales.service.permission.bo.AfterSalePermissionCreateReqBO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -40,12 +44,17 @@
     private AfterSaleTicketMapper ticketMapper;
     @Resource
     private AfterSaleTicketItemMapper ticketItemMapper;
+    @Resource
+    private AfterSaleReturnMapper returnMapper;
 
     @Resource
     private AfterSaleNoRedisDAO noRedisDAO;
 
     @Resource
     private AfterSalePermissionService permissionService;
+
+    @Resource
+    private StorageAttachmentApi storageAttachmentApi;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -56,10 +65,12 @@
             throw exception(TICKET_NO_EXISTS);
         }
 
-        // 2. 鎻掑叆宸ュ崟
+        // 2. 鎻掑叆宸ュ崟锛堝~浜嗗鐞嗕汉鍗宠涓哄凡鎸囨淳锛岀洿鎺ヨ繘鍏ュ鐞嗕腑锛�
         AfterSaleTicketDO ticket = BeanUtils.toBean(createReqVO, AfterSaleTicketDO.class)
                 .setNo(no)
-                .setStatus(AfterSaleTicketStatusEnum.DRAFT.getStatus())
+                .setStatus(createReqVO.getHandlerUserId() != null
+                        ? AfterSaleTicketStatusEnum.PROCESSING.getStatus()
+                        : AfterSaleTicketStatusEnum.DRAFT.getStatus())
                 .setOwnerUserId(userId);
         ticketMapper.insert(ticket);
 
@@ -72,7 +83,11 @@
             });
         }
 
-        // 4. 鍒涘缓鏁版嵁鏉冮檺锛堣礋璐d汉锛�
+        // 4. 缁戝畾闄勪欢
+        storageAttachmentApi.bindAttachments("file", "aftersales_after_sale_ticket",
+                ticket.getId(), createReqVO.getBlobIds());
+
+        // 5. 鍒涘缓鏁版嵁鏉冮檺锛堣礋璐d汉锛�
         AfterSalePermissionCreateReqBO permBO = new AfterSalePermissionCreateReqBO();
         permBO.setBizType(AfterSaleBizTypeEnum.AFTER_SALE_TICKET.getType());
         permBO.setBizId(ticket.getId());
@@ -90,8 +105,12 @@
         AfterSaleTicketDO ticket = validateTicketExists(updateReqVO.getId());
         validateTicketStatus(ticket, AfterSaleTicketStatusEnum.DRAFT);
 
-        // 2. 鏇存柊宸ュ崟
+        // 2. 鏇存柊宸ュ崟锛堣崏绋垮崟濉簡澶勭悊浜哄嵆瑙嗕负鎸囨淳锛岃繘鍏ュ鐞嗕腑锛�
         AfterSaleTicketDO updateObj = BeanUtils.toBean(updateReqVO, AfterSaleTicketDO.class);
+        if (AfterSaleTicketStatusEnum.DRAFT.getStatus().equals(ticket.getStatus())
+                && updateReqVO.getHandlerUserId() != null) {
+            updateObj.setStatus(AfterSaleTicketStatusEnum.PROCESSING.getStatus());
+        }
         ticketMapper.updateById(updateObj);
 
         // 3. 鏇存柊鏄庣粏琛岋紙鍏堝垹鍚庡锛�
@@ -103,6 +122,9 @@
                 ticketItemMapper.insert(itemDO);
             });
         }
+
+        // 4. 鏇存柊闄勪欢
+        storageAttachmentApi.updateAttachments("file", "aftersales_after_sale_ticket", updateReqVO.getId(), updateReqVO.getBlobIds());
     }
 
     @Override
@@ -113,6 +135,7 @@
         // 杞垹闄�
         ticketMapper.deleteById(id);
         ticketItemMapper.deleteByTicketId(id);
+        storageAttachmentApi.deleteAttachmentsByRecord("aftersales_after_sale_ticket", id);
         permissionService.deletePermission(AfterSaleBizTypeEnum.AFTER_SALE_TICKET.getType(), id);
     }
 
@@ -166,6 +189,12 @@
         AfterSaleTicketDO ticket = validateTicketExists(id);
         validateTicketStatus(ticket, AfterSaleTicketStatusEnum.PROCESSING,
                 AfterSaleTicketStatusEnum.WAITING_RETURN, AfterSaleTicketStatusEnum.WAITING_REFUND);
+        if (ticket.getReturnId() != null) {
+            AfterSaleReturnDO returnDO = returnMapper.selectById(ticket.getReturnId());
+            if (returnDO == null || !AfterSaleReturnStatusEnum.REFUNDED.getStatus().equals(returnDO.getStatus())) {
+                throw exception(RETURN_TICKET_NOT_FINISHED);
+            }
+        }
         ticketMapper.updateById(new AfterSaleTicketDO().setId(id)
                 .setStatus(AfterSaleTicketStatusEnum.COMPLETED.getStatus())
                 .setResolvedTime(LocalDateTime.now()));
@@ -176,6 +205,14 @@
     public void closeTicket(Long id) {
         AfterSaleTicketDO ticket = validateTicketExists(id);
         validateTicketStatus(ticket, AfterSaleTicketStatusEnum.COMPLETED);
+        if (ticket.getReturnId() != null) {
+            AfterSaleReturnDO returnDO = returnMapper.selectById(ticket.getReturnId());
+            if (returnDO == null || !AfterSaleReturnStatusEnum.REFUNDED.getStatus().equals(returnDO.getStatus())) {
+                throw exception(RETURN_TICKET_NOT_FINISHED);
+            }
+            returnMapper.updateById(new AfterSaleReturnDO().setId(returnDO.getId())
+                    .setStatus(AfterSaleReturnStatusEnum.CLOSED.getStatus()));
+        }
         ticketMapper.updateById(new AfterSaleTicketDO().setId(id)
                 .setStatus(AfterSaleTicketStatusEnum.CLOSED.getStatus())
                 .setClosedTime(LocalDateTime.now()));

--
Gitblit v1.9.3