From 0050dd162062b1f7b5a7f04487dca6b4fe85339e Mon Sep 17 00:00:00 2001 From: jihaipeng <3204568531@qq.com> Date: Mon, 21 Jul 2025 18:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lottery/exception/BusinessException.java | 23 +++++ .../lottery/exception/GlobalExceptionHandler.java | 8 ++ .../src/main/java/com/lottery/dto/ActivityDto.java | 21 +++++ .../main/java/com/lottery/dto/ActivityTimeDto.java | 27 ++++++ .../java/com/lottery/dto/FundingActivityDto.java | 7 ++ .../main/java/com/lottery/dto/VriableAddDto.java | 5 ++ .../src/main/java/com/lottery/vo/ApiFundingVO.java | 10 +-- .../main/java/com/lottery/vo/FundingDataVO.java | 17 +--- .../src/main/java/com/lottery/vo/FundingVo.java | 27 ++++++ .../admin/controller/FundingController.java | 68 +++++++-------- .../com/lottery/admin/mapper/IFundingMapper.java | 6 ++ .../com/lottery/admin/service/IFundingService.java | 8 +- .../admin/service/Impl/FundingServiceImpl.java | 99 ++++++++++++++++++---- .../com/lottery/api/mapper/ApiIFundingMapper.java | 4 + .../api/service/Impl/ApiFundingServiceImpl.java | 11 +++ .../main/resources/mapper/admin/fundingMapper.xml | 18 +++- .../resources/mapper/api/ApiIFundingService.xml | 16 ++++ 17 files changed, 299 insertions(+), 76 deletions(-) create mode 100644 lottery-system/lottery-common/src/main/java/com/lottery/exception/BusinessException.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityDto.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityTimeDto.java create mode 100644 lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingVo.java diff --git a/lottery-system/lottery-common/src/main/java/com/lottery/exception/BusinessException.java b/lottery-system/lottery-common/src/main/java/com/lottery/exception/BusinessException.java new file mode 100644 index 0000000..88c8b09 --- /dev/null +++ b/lottery-system/lottery-common/src/main/java/com/lottery/exception/BusinessException.java @@ -0,0 +1,23 @@ +package com.lottery.exception; + +/** + * @program: lottery-system + * @ClassName BusinessException + * @description: + * @author:jihaipeng + * @create: 2025−07-21 17:09 + * @Version 1.0 + **/ + +public class BusinessException extends RuntimeException { + private int code; // 错误码（如 400） + + public BusinessException(int code, String message) { + super(message); + this.code = code; + } + + public int getCode() { + return code; + } +} diff --git a/lottery-system/lottery-common/src/main/java/com/lottery/exception/GlobalExceptionHandler.java b/lottery-system/lottery-common/src/main/java/com/lottery/exception/GlobalExceptionHandler.java index 762b050..cbb393c 100644 --- a/lottery-system/lottery-common/src/main/java/com/lottery/exception/GlobalExceptionHandler.java +++ b/lottery-system/lottery-common/src/main/java/com/lottery/exception/GlobalExceptionHandler.java @@ -101,6 +101,14 @@ public class GlobalExceptionHandler { ex.getParameterType()); } + + + // 捕获自定义业务异常 + @ExceptionHandler(BusinessException.class) + public Result handleBusinessException(BusinessException e) { + return Result.failure(e.getCode(), e.getMessage()); + } + /** * 处理系统异常 */ diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityDto.java new file mode 100644 index 0000000..ad93e24 --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityDto.java @@ -0,0 +1,21 @@ +package com.lottery.dto; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +import javax.validation.constraints.NotNull; + +/** + * @program: lottery-system + * @ClassName ActivityDto + * @description: + * @author:jihaipeng + * @create: 2025−07-21 16:07 + * @Version 1.0 + **/ +@Data +@Slf4j +public class ActivityDto { + @NotNull(message = "活动id不能为空") + private Integer activityId; +} diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityTimeDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityTimeDto.java new file mode 100644 index 0000000..c4a559d --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/ActivityTimeDto.java @@ -0,0 +1,27 @@ +package com.lottery.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import javax.validation.constraints.NotNull; + +/** + * @program: lottery-system + * @ClassName ActivityTimeDto + * @description: + * @author:jihaipeng + * @create: 2025−07-21 17:47 + * @Version 1.0 + **/ +@Data +@Slf4j +@AllArgsConstructor +@NoArgsConstructor +public class ActivityTimeDto { + @NotNull(message = "活动ID不能为空") + private Integer activityId; + @NotNull(message = "时间不能为空") + private Integer time; +} diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/FundingActivityDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/FundingActivityDto.java index b782cef..2502a2d 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/FundingActivityDto.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/FundingActivityDto.java @@ -3,6 +3,7 @@ package com.lottery.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotNull; import java.time.LocalDate; import java.util.Date; @@ -17,10 +18,16 @@ import java.util.Date; @Data public class FundingActivityDto { + @NotNull(message = "活动名称不能为空") private String activityName; // 活动名称 + @NotNull(message = "市场一不能为空") private Integer marketOne; // 市场一(如USA) + @NotNull(message = "市场二不能为空") private Integer marketTwo; // 市场二(如HK) + @NotNull(message = "活动状态不能为空") private Integer status; // 状态(1-启用,0-禁用) + @NotNull(message = "活动开始时间不能为空") private LocalDate startTime; // 活动开始时间 + @NotNull(message = "活动结束时间不能为空") private LocalDate endTime; // 活动结束时间 } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/VriableAddDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/VriableAddDto.java index 99a29b4..6715a69 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/VriableAddDto.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/VriableAddDto.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; + /** * @program: lottery-system * @ClassName VriableAdd @@ -16,7 +18,10 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class VriableAddDto { + @NotNull(message = "活动ID不能为空") private Integer activityId; + @NotNull(message = "市场不能为空") private Integer stock; + @NotNull(message = "添加数量不能为空") private Integer addTotal; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/ApiFundingVO.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/ApiFundingVO.java index 5c53ee5..b5e45a5 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/ApiFundingVO.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/ApiFundingVO.java @@ -5,16 +5,10 @@ import lombok.Data; import java.time.LocalDate; import java.util.List; -/** - * @program: lottery-system - * @ClassName ApiFundingVO - * @description: - * @author:jihaipeng - * @create: 2025−07-16 11:30 - * @Version 1.0 - **/ + @Data public class ApiFundingVO { + private Integer activityId; private List data; private LocalDate startTime; private LocalDate endTime; diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java index 97b184e..672acbd 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingDataVO.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @program: lottery-system * @ClassName FundingDataVO @@ -16,19 +18,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class FundingDataVO { - private Integer marketOneId; - private Integer marketTwoId; - private String marketOne; - private String marketTwo; + private List data; private Integer time; - - private Integer showOne; - private Integer showTwo; - - private Integer markerOneVirtual; - private Integer markerTwoVirtual; - - - private Integer markerOneTotal; - private Integer markerTwoTotal; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingVo.java new file mode 100644 index 0000000..66dcd81 --- /dev/null +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingVo.java @@ -0,0 +1,27 @@ +package com.lottery.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * @program: lottery-system + * @ClassName FundingVo + * @description: + * @author:jihaipeng + * @create: 2025−07-21 16:43 + * @Version 1.0 + **/ +@Data +@Slf4j +@AllArgsConstructor +@NoArgsConstructor +public class FundingVo { + private Integer marketId; + private String market; + private Integer show; + private Integer markerVirtual; + private Integer markerTotal; + +} 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 1ce5ff9..6edf2f5 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 @@ -3,10 +3,8 @@ package com.lottery.admin.controller; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.lottery.dto.FundingActivityDto; +import com.lottery.dto.*; import com.lottery.admin.service.IFundingService; -import com.lottery.dto.FundingUserDto; -import com.lottery.dto.VriableAddDto; import com.lottery.result.Result; import com.lottery.vo.FundingActivityVo; import com.lottery.vo.FundingDataVO; @@ -59,10 +57,11 @@ public class FundingController { @PostMapping("/updateActivityStatus") public Result updateActivityStatus(@RequestParam @Validated Integer id, @RequestParam @Validated Integer status) { LOGGER.info("修改的众筹活动id为{}，修改的众筹活动状态为{}", id, status); + //查看活动是否存在 + // 参数校验 if (id == null || status == null) { return Result.failure("参数不能为空"); - } if (status != 0 && status != 1) { // 假设状态只有0/1 @@ -87,23 +86,25 @@ public class FundingController { //根据活动id查询助力详情 @PostMapping("/getActivityDetail") - public Result> getActivityDetail(@RequestBody FundingUserDto fundingUserDto) { + public Result> getActivityDetail(@RequestBody @Valid FundingUserDto fundingUserDto) { + //检查活动是否存在 LOGGER.info("接口getActivityDetail查询助力详情，查询条件{}", fundingUserDto); // 必填参数校验（可选，但推荐） if (fundingUserDto.getActivityId() == null) { throw new IllegalArgumentException("activityId 不能为空"); } - return Result.success(fundingService.getActivityDetail(fundingUserDto)); + return fundingService.getActivityDetail(fundingUserDto); } // //根据活动id查询数据统计 @PostMapping("/getActivityDate") - public Result> getActivityDate(@RequestParam Integer activityId) { - LOGGER.info("接口getActivityDate查询后台数据统计,活动id为{}", activityId); - if(fundingService.getActivityDate(activityId)==null){ + public Result> getActivityDate(@RequestBody @Valid ActivityDto activityIdDto) { + + LOGGER.info("接口getActivityDate查询后台数据统计,活动id为{}", activityIdDto.getActivityId()); + if(fundingService.getActivityDate(activityIdDto.getActivityId())==null){ return Result.failure("活动不存在，查询失败"); } - return Result.success(fundingService.getActivityDate(activityId)); + return Result.success(fundingService.getActivityDate(activityIdDto.getActivityId())); } // //添加用户参与记录 @@ -114,14 +115,14 @@ public class FundingController { //设置活动初始时间 @PostMapping("/setActivityTime") - public Result setActivityTime(@RequestParam Integer activityId, @RequestParam Integer time) { - LOGGER.info("设置id={}的活动初始时间为{}", activityId, time); - return fundingService.setActivityTime(activityId, time); + public Result setActivityTime(@RequestBody ActivityTimeDto activityTimeDto) { + LOGGER.info("设置id={}的活动初始时间为{}", activityTimeDto.getActivityId(), activityTimeDto.getTime()); + return fundingService.setActivityTime( activityTimeDto.getActivityId(), activityTimeDto.getTime()); } //添加虚拟次数 @PostMapping("/addDateVirtual") - public Result addVirtual(@RequestBody VriableAddDto vriableAddDto) { + public Result addVirtual(@RequestBody @Valid VriableAddDto vriableAddDto) { LOGGER.info("添加虚拟次数"); Integer activityId = vriableAddDto.getActivityId(); Integer stock = vriableAddDto.getStock(); @@ -132,18 +133,20 @@ public class FundingController { //返回数据详情 @PostMapping("/getDate") - public Result getDate(@RequestParam Integer activityId) { - LOGGER.info("返回id={}的活动的设置数据详情", activityId); - FundingDataVO date = fundingService.getDate1(activityId); - try { - ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(date); - LOGGER.info("返回的 JSON 数据: {}", json); - } catch (JsonProcessingException e) { - LOGGER.error("JSON 转换失败", e); - } - return Result.success(date); - //return Result.success(date); + public Result getDate(@RequestBody @Valid ActivityDto activityIdDto) { + LOGGER.info("返回id={}的活动的设置数据详情", activityIdDto.getActivityId()); + + +// +// try { +// ObjectMapper mapper = new ObjectMapper(); +// String json = mapper.writeValueAsString(date); +// LOGGER.info("返回的 JSON 数据: {}", json); +// } catch (JsonProcessingException e) { +// LOGGER.error("JSON 转换失败", e); +// } + return fundingService.getDate1(activityIdDto.getActivityId()); + } //获取市场股票列表 @@ -162,18 +165,17 @@ public class FundingController { //删除活动 @PostMapping("/deleteActivity") - public Result deleteActivity(@RequestParam Integer activityId) { - LOGGER.info("删除活动：{}",activityId); - fundingService.deleteActivity(activityId); - return Result.success("删除成功"); + public Result deleteActivity(@RequestBody ActivityDto activityIdDto) { + LOGGER.info("删除活动：{}",activityIdDto.getActivityId()); + return fundingService.deleteActivity(activityIdDto.getActivityId()); } //查看对应活动的市场列表 @PostMapping("/getMarketList") - public Result> getMarketList(@RequestParam Integer activityId) { + public Result> getMarketList(@RequestBody ActivityDto activityIdDto) { LOGGER.info("查看对应活动的市场列表"); - List marketList = fundingService.getMarketListByActivityId(activityId); - return Result.success(marketList); + return fundingService.getMarketListByActivityId(activityIdDto.getActivityId()); + } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java index 67ac1b8..b369718 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java @@ -77,4 +77,10 @@ public interface IFundingMapper { String selectMarketName(Integer one); List getMarketListByActivityId(Integer activityId); + + Integer selectActivityCount(Integer id); + + Integer selectmarket(Integer id); + + Integer selectmarketCount(Integer market); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java index ab76476..8dd9313 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java @@ -30,7 +30,7 @@ public interface IFundingService { Result addActivity(FundingActivityDto fundingActivityDto); - Map getActivityDetail(FundingUserDto fundingUserDto); + Result> getActivityDetail(FundingUserDto fundingUserDto); Map getActivityDate(Integer activityId); @@ -40,13 +40,13 @@ public interface IFundingService { Result addVirtual(Integer activityId, Integer stock, Integer addTotal); - FundingDataVO getDate1(Integer activityId); + Result getDate1(Integer activityId); List getMarketList(); void exportActivityData(FundingUserDto fundingUserDto, HttpServletResponse response) throws IOException; - void deleteActivity(Integer activityId); + Result deleteActivity(Integer activityId); - List getMarketListByActivityId(Integer activityId); + Result> getMarketListByActivityId(Integer activityId); } 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 48b665a..eddc8ba 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 @@ -9,13 +9,11 @@ import com.lottery.entity.Activity; import com.lottery.admin.mapper.IFundingMapper; import com.lottery.admin.service.IFundingService; import com.lottery.entity.FundingExport; +import com.lottery.exception.BusinessException; import com.lottery.result.Result; import com.lottery.utils.ConvertBeanUtil; import com.lottery.utils.ValidationUtils; -import com.lottery.vo.FundingActivityVo; -import com.lottery.vo.FundingDataVO; -import com.lottery.vo.FundingUserVo; -import com.lottery.vo.MarketVo; +import com.lottery.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +23,7 @@ import java.net.URLEncoder; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.chrono.ChronoLocalDate; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -63,6 +62,10 @@ public class FundingServiceImpl implements IFundingService { return Result.failure("当前有活动正在启用,修改状态失败"); } } + Integer count = fundingMapper.selectmarket(id); + if(count ==0){ + return Result.failure("所要修改的市场不存在"); + } fundingMapper.updateActivityStatus(id, status); return Result.success("修改状态成功"); } @@ -98,6 +101,15 @@ public class FundingServiceImpl implements IFundingService { return Result.failure("市场添加重复"); } } + //查询市场是否存在 + Integer count = fundingMapper.selectmarketCount(fundingActivityDto.getMarketOne()); + Integer count2 = fundingMapper.selectmarketCount(fundingActivityDto.getMarketTwo()); + if(count == 0){ + return Result.failure("市场一不存在"); + } + if(count2 == 0){ + return Result.failure("市场二不存在"); + } //查询状态 Integer status = fundingMapper.selectStatus(); Integer statuss = fundingActivityDto.getStatus(); @@ -131,10 +143,23 @@ public class FundingServiceImpl implements IFundingService { } @Override - public Map getActivityDetail(FundingUserDto fundingUserDto) { + public Result> getActivityDetail(FundingUserDto fundingUserDto) { + + Integer count = fundingMapper.selectActivityCount(fundingUserDto.getActivityId()); + if(count == 0){ + return Result.failure("所查询的众筹活动不存在"); + } + //查询所选择的市场是否存在 + if(fundingUserDto.getMarketSign()!= null ){ + Integer count2 = fundingMapper.selectmarketCount(fundingUserDto.getMarketSign()); + if(count2 == 0){ + return Result.failure("所选择市场不存在"); + } + } + + // 计算分页偏移量 int offset = (fundingUserDto.getPage() - 1) * fundingUserDto.getPagesize(); - // 查询数据列表 List list = fundingMapper.selectByCondition( fundingUserDto.getActivityId(), @@ -158,7 +183,7 @@ public class FundingServiceImpl implements IFundingService { result.put("total", total); result.put("page", fundingUserDto.getPage()); result.put("pageSize", fundingUserDto.getPagesize()); - return result; + return Result.success(result); } @@ -263,13 +288,27 @@ public class FundingServiceImpl implements IFundingService { if(stock == null){ return Result.failure("库存不能为空"); } + //检查活动是否存在 + Integer status = fundingMapper.selectmarket(activityId); + if(status ==null || status == 0){ + return Result.failure("所要设置的活动不存在"); + } + Integer marketCount = fundingMapper.selectmarketCount(stock); + if(marketCount ==null || marketCount == 0){ + return Result.failure("所要设置市场不存在"); + } fundingMapper.setVirtual(activityId, stock, addTotal); return Result.success("设置虚拟次数成功"); } @Override - public FundingDataVO getDate1(Integer activityId) { + public Result getDate1(Integer activityId) { + //检查活动是否存在 + Integer status = fundingMapper.selectmarket(activityId); + if(status ==null || status == 0){ + return Result.failure("所要查询的活动不存在"); + } //根据活动id查询俩个市场,俩个市场是一条数据 Map market = fundingMapper.getMarket(activityId); @@ -309,11 +348,13 @@ public class FundingServiceImpl implements IFundingService { Integer time = fundingMapper.getTime(activityId,One); - Map result = new HashMap<>(); - - FundingDataVO fundingDataVO = new FundingDataVO(One, Two,marketOne, marketTwo, time, showOne, showTwo, markerOneVirtual, markerTwoVirtual, markerOneTotal, markerTwoTotal); - - return fundingDataVO; + FundingVo one = new FundingVo(One, marketOne, showOne, markerOneVirtual, markerOneTotal); + FundingVo two = new FundingVo(Two, marketTwo, showTwo, markerTwoVirtual, markerTwoTotal); + List list = new ArrayList<>(); + list.add(one); + list.add(two); + FundingDataVO fundingDataVO = new FundingDataVO(list, time); + return Result.success(fundingDataVO); } @Override @@ -325,6 +366,20 @@ public class FundingServiceImpl implements IFundingService { //导出数据 @Override public void exportActivityData(FundingUserDto fundingUserDto, HttpServletResponse response) throws IOException { + //检查活动id是否存在 + Integer count = fundingMapper.selectmarket(fundingUserDto.getActivityId()); + if(count == null || count == 0) + throw new BusinessException(400,"所要查询的活动不存在"); + + if(fundingUserDto.getMarketSign() != null){ + //检查市场是否存在 + Integer marketCount = fundingMapper.selectmarketCount(fundingUserDto.getMarketSign()); + if(marketCount == null || marketCount == 0) + throw new BusinessException(400,"所要查询的市场不存在"); + } + + + response.setContentType("application/json.openxmlfomats-officedocument.spreadsheetml.sheet;charset=utf-8"); response.setCharacterEncoding("utf-8"); //根据活动id查询活动名称 @@ -354,15 +409,27 @@ public class FundingServiceImpl implements IFundingService { } @Override - public void deleteActivity(Integer id) { + public Result deleteActivity(Integer id) { + + + //产看股票是否存在 + Integer count = fundingMapper.selectActivityCount(id); + if(count == 0){ + return Result.failure("活动不存在,删除失败"); + } fundingMapper.deleteActivity(id); fundingMapper.deleteDate(id); fundingMapper.deleteZuser(id); + return Result.success("删除成功"); } @Override - public List getMarketListByActivityId(Integer activityId) { - return fundingMapper.getMarketListByActivityId(activityId); + public Result > getMarketListByActivityId(Integer activityId) { + //检查活动id是否存在 + Integer count = fundingMapper.selectmarket(activityId); + if(count == null || count == 0) + throw new BusinessException(400,"所要查询的活动不存在"); + return Result.success(fundingMapper.getMarketListByActivityId(activityId)); } } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java index a9489fe..744e2aa 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java @@ -39,4 +39,8 @@ public interface ApiIFundingMapper { String selectMarket(Integer marketOne); LocalDate selectIsZhuli(Integer activityId, String jwcode, Integer marketSign); + + Integer selectActivityISExist(Integer activityId); + + Integer selectMarketISExist(Integer market); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java index cbf720a..d4b7d28 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java @@ -146,6 +146,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService { apiFundingVO.setData(Arrays.asList(marketone,markettwo)); + apiFundingVO.setActivityId(activityId); return Result.success(apiFundingVO); } @@ -153,6 +154,16 @@ public class ApiFundingServiceImpl implements ApiIFundingService { @Override public Result addRecord(String token,FundingRecordDto fundingRecordDto) { + //检查活动id是否存在 + Integer count = fundingMapper.selectActivityISExist(fundingRecordDto.getActivityId()); + if(count == null || count == 0){ + return Result.failure("所要参加的活动不存在"); + } + //检查市场是否存在 + Integer marketCount = fundingMapper.selectMarketISExist(fundingRecordDto.getMarketSign()); + if(marketCount == null || marketCount == 0) + return Result.failure("所要参加的市场不存在"); + try { // 1. 定义请求 URL String url = "https://api.homilychart.com/hljw/api/v2/member/info"; diff --git a/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml index a185457..5208074 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml @@ -233,6 +233,22 @@ WHERE activity.id = #{activityId} - + + + \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml b/lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml index a9a973a..5d60fe9 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml @@ -95,6 +95,22 @@ order by join_time desc LIMIT 1 + + \ No newline at end of file