From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin

---
 oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
index 081c554..9d28813 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MessageOrderLeaveServiceImpl.java
@@ -1,5 +1,6 @@
 package com.oying.modules.message.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.oying.modules.message.domain.MessageOrderLeave;
 import com.oying.utils.FileUtil;
 import lombok.RequiredArgsConstructor;
@@ -46,13 +47,13 @@
         messageOrderLeaveMapper.insert(resources);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(MessageOrderLeave resources) {
-        MessageOrderLeave messageOrderLeave = getById(resources.getId());
-        messageOrderLeave.copy(resources);
-        messageOrderLeaveMapper.updateById(messageOrderLeave);
-    }
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    public void update(MessageOrderLeave resources) {
+//        MessageOrderLeave messageOrderLeave = getById(resources.getId());
+//        messageOrderLeave.copy(resources);
+//        messageOrderLeaveMapper.updateById(messageOrderLeave);
+//    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -74,4 +75,15 @@
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    /**
+     * 根据订单ID查找留言信息
+     * @param orderId 订单ID
+     * @return 匹配的留言记录,若不存在则返回 null
+     */
+    public MessageOrderLeave findByOrderId(Integer orderId) {
+        return baseMapper.selectOne(new QueryWrapper<MessageOrderLeave>()
+                .eq("order_id", orderId));
+    }
+
 }

--
Gitblit v1.9.3