From 039b3e03a208a3e7ec1b23058d4b5ac7368e1195 Mon Sep 17 00:00:00 2001
From: jihaipeng <3204568531@qq.com>
Date: Fri, 18 Jul 2025 11:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lottery/admin/controller/FundingController.java    | 5 +----
 .../main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java
index 8738804..c87eebd 100644
--- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java
+++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java
@@ -82,12 +82,9 @@ public class FundingController {
     @PostMapping("/addActivity")
     public Result<String> addActivity(@Validated @RequestBody FundingActivityDto fundingActivityDto) {
         LOGGER.info("添加活动，参数为{}", fundingActivityDto);
-        try {
+
             return fundingService.addActivity(fundingActivityDto);
 
-        } catch (Exception e) {
-            return Result.failure("添加活动失败");
-        }
     }
 
     //根据活动id查询助力详情
diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
index b23ce98..f1fdc49 100644
--- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
+++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
@@ -96,6 +96,11 @@ public class FundingServiceImpl implements IFundingService {
         if (fundingActivityDto.getEndTime().isBefore(ChronoLocalDate.from(now))) {
             return Result.failure("结束时间不能早于当前时间");
         }
+        if(fundingActivityDto.getMarketOne().equals(fundingActivityDto.getMarketTwo())){
+            if(fundingMapper.selectStatus()==1){
+                return Result.failure("市场添加重复");
+            }
+        }
         //查询状态
         Integer status = fundingMapper.selectStatus();
         Integer statuss = fundingActivityDto.getStatus();