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 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();