Merge branch 'jihaipeng/feature-20250714184358-抽奖众筹' into milestone-20250723-wwl

lottery-system/lottery-common/src/main/java/com/lottery/exception/GlobalExceptionHandler.java

@@ -107,19 +107,24 @@ public class GlobalExceptionHandler {
 
 
     // 捕获自定义业务异常
+//    @ExceptionHandler(BusinessException.class)
+//    public ResponseEntity<Result> handleBusinessException(BusinessException ex, HttpServletRequest request) {
+//        HttpHeaders headers = new HttpHeaders();
+//        headers.set("Access-Control-Allow-Origin", "*"); // 或指定域名
+//        headers.set("Access-Control-Allow-Credentials", "true");
+//        // 构建统一的错误响应
+//        Result<Void> errorResult = Result.failure(ex.getCode(), ex.getMessage());
+//
+//
+//        return ResponseEntity
+//                .status(ex.getCode()) // 使用 BusinessException 中的状态码
+//                .headers(headers)
+//                .body(errorResult); // 返回 Result 作为响应体
+//    }
+    // 捕获自定义业务异常
     @ExceptionHandler(BusinessException.class)
-    public ResponseEntity<Result> handleBusinessException(BusinessException ex, HttpServletRequest request) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Access-Control-Allow-Origin", "*"); // 或指定域名
-        headers.set("Access-Control-Allow-Credentials", "true");
-        // 构建统一的错误响应
-        Result<Void> errorResult = Result.failure(ex.getCode(), ex.getMessage());
-
-
-        return ResponseEntity
-                .status(ex.getCode()) // 使用 BusinessException 中的状态码
-                .headers(headers)
-                .body(errorResult); // 返回 Result 作为响应体
+    public Result<Void> handleBusinessException(BusinessException e) {
+        return Result.failure(e.getCode(), e.getMessage());
     }
 
     /**

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java

@@ -18,8 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Transactional;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.chrono.ChronoLocalDate;
@@ -409,6 +411,7 @@ public class FundingServiceImpl implements IFundingService {
     }
 
     @Override
+    @Transactional(rollbackOn = SQLException.class)
     public Result<String> deleteActivity(Integer id) {
 
 
@@ -417,9 +420,11 @@ public class FundingServiceImpl implements IFundingService {
         if(count == 0){
             return Result.failure("活动不存在,删除失败");
         }
+
         fundingMapper.deleteActivity(id);
         fundingMapper.deleteDate(id);
         fundingMapper.deleteZuser(id);
+
         return Result.success("删除成功");
     }
 

lottery-system/lottery-service/src/main/java/com/lottery/config/WebConfig.java

@@ -31,6 +31,7 @@ public class WebConfig implements WebMvcConfigurer {
                 );
     }
 
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")