From dc3a923dcf09ba9ae0e46fa0916ac70d258d7b70 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 25 Aug 2025 16:23:51 +0800
Subject: [PATCH] Merge branch 'master' into xin

---
 oying-system/src/main/java/com/oying/modules/message/service/impl/MesOrderEvaluationServiceImpl.java |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesOrderEvaluationServiceImpl.java b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesOrderEvaluationServiceImpl.java
index e5792cc..f59c7eb 100644
--- a/oying-system/src/main/java/com/oying/modules/message/service/impl/MesOrderEvaluationServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/message/service/impl/MesOrderEvaluationServiceImpl.java
@@ -1,30 +1,31 @@
 package com.oying.modules.message.service.impl;
 
-import com.oying.modules.message.domain.MesOrderEvaluation;
-import com.oying.modules.message.domain.myDto.MesOrderEvaluationDto;
-import com.oying.utils.FileUtil;
-import lombok.RequiredArgsConstructor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.oying.modules.message.service.MesOrderEvaluationService;
+import com.oying.modules.message.domain.MesOrderEvaluation;
 import com.oying.modules.message.domain.dto.MesOrderEvaluationQueryCriteria;
+import com.oying.modules.message.domain.myDto.MesOrderEvaluationDto;
 import com.oying.modules.message.mapper.MesOrderEvaluationMapper;
+import com.oying.modules.message.service.MesOrderEvaluationService;
+import com.oying.utils.FileUtil;
+import com.oying.utils.PageResult;
+import com.oying.utils.PageUtil;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.oying.utils.PageUtil;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
+
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
-import com.oying.utils.PageResult;
+import java.util.List;
+import java.util.Map;
 
 /**
-* @description 服务实现
-* @author 李萌
-* @date 2025-07-25
-**/
+ * @author 李萌
+ * @description 服务实现
+ * @date 2025-07-25
+ **/
 @Service
 @RequiredArgsConstructor
 public class MesOrderEvaluationServiceImpl extends ServiceImpl<MesOrderEvaluationMapper, MesOrderEvaluation> implements MesOrderEvaluationService {
@@ -32,12 +33,12 @@
     private final MesOrderEvaluationMapper mesOrderEvaluationMapper;
 
     @Override
-    public PageResult<MesOrderEvaluation> queryAll(MesOrderEvaluationQueryCriteria criteria, Page<Object> page){
+    public PageResult<MesOrderEvaluation> queryAll(MesOrderEvaluationQueryCriteria criteria, Page<Object> page) {
         return PageUtil.toPage(mesOrderEvaluationMapper.findAll(criteria, page));
     }
 
     @Override
-    public List<MesOrderEvaluation> queryAll(MesOrderEvaluationQueryCriteria criteria){
+    public List<MesOrderEvaluation> queryAll(MesOrderEvaluationQueryCriteria criteria) {
         return mesOrderEvaluationMapper.findAll(criteria);
     }
 
@@ -90,6 +91,7 @@
         FileUtil.downloadExcel(list, response);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addShopEvaluation(MesOrderEvaluationDto resources) {
         mesOrderEvaluationMapper.addShopEvaluation(resources);

--
Gitblit v1.9.3