From 4870ec9a1fa53a190de0c79de4ffdaf7a05a0cbf Mon Sep 17 00:00:00 2001 From: jihaipeng <3204568531@qq.com> Date: Sun, 20 Jul 2025 11:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lottery/vo/ApiFundingVO.java | 2 ++ .../src/main/java/com/lottery/vo/FundingDataVO.java | 2 ++ .../lottery/admin/controller/FundingController.java | 8 ++++++++ .../java/com/lottery/admin/mapper/IFundingMapper.java | 2 ++ .../com/lottery/admin/service/IFundingService.java | 2 ++ .../admin/service/Impl/FundingServiceImpl.java | 16 +++++++++++++++- .../com/lottery/api/mapper/ApiIFundingMapper.java | 2 ++ .../api/service/Impl/ApiFundingServiceImpl.java | 15 ++++++++++++--- .../src/main/resources/mapper/admin/fundingMapper.xml | 19 +++++++++++++++++++ .../main/resources/mapper/api/ApiIFundingService.xml | 12 ++++++++++++ 10 files changed, 76 insertions(+), 4 deletions(-) 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 dc96b0c..a3e4b29 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 @@ -14,6 +14,8 @@ import java.time.LocalDate; **/ @Data public class ApiFundingVO { + private Integer marketOneId; + private Integer marketTwoId; private String marketOne; private String marketTwo; private LocalDate startTime; 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 3e0e1f1..97b184e 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 @@ -16,6 +16,8 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class FundingDataVO { + private Integer marketOneId; + private Integer marketTwoId; private String marketOne; private String marketTwo; private Integer time; 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 4d8be2b..b162782 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 @@ -167,5 +167,13 @@ public class FundingController { return Result.success("删除成功"); } + //查看对应活动的市场列表 + @PostMapping("/getMarketList") + public Result> getMarketList(@RequestParam Integer activityId) { + LOGGER.info("查看对应活动的市场列表"); + List marketList = fundingService.getMarketListByActivityId(activityId); + return Result.success(marketList); + } + } 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 4bd5c1a..67ac1b8 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 @@ -75,4 +75,6 @@ public interface IFundingMapper { Map getMarket(Integer activityId); String selectMarketName(Integer one); + + List getMarketListByActivityId(Integer activityId); } 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 3283370..ab76476 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 @@ -47,4 +47,6 @@ public interface IFundingService { void exportActivityData(FundingUserDto fundingUserDto, HttpServletResponse response) throws IOException; void deleteActivity(Integer activityId); + + List 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 2303661..4eb9df0 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 @@ -177,6 +177,14 @@ public class FundingServiceImpl implements IFundingService { //获取map Integer marketOne =(Integer) market.get("market_one"); Integer marketTwo = (Integer) market.get("market_two"); + + + //根据市场id查询市场名称 + String marketOneName = fundingMapper.selectMarketName(marketOne); + String marketTwoName = fundingMapper.selectMarketName(marketTwo); + market.put("marketOneName", marketOneName); + market.put("marketTwoName", marketTwoName); + //参与市场一的人数 Integer markerOnePeople = fundingMapper.searchMarketPeople(activityId, marketOne); //市场一的总的助力次数 @@ -267,6 +275,7 @@ public class FundingServiceImpl implements IFundingService { Map market = fundingMapper.getMarket(activityId); //获取map Integer One = (Integer) market.get("market_one"); + //根据id查名称 String marketOne = fundingMapper.selectMarketName(One); //市场一的总的助力次数 @@ -302,7 +311,7 @@ public class FundingServiceImpl implements IFundingService { Map result = new HashMap<>(); - FundingDataVO fundingDataVO = new FundingDataVO(marketOne, marketTwo, time, showOne, showTwo, markerOneVirtual, markerTwoVirtual, markerOneTotal, markerTwoTotal); + FundingDataVO fundingDataVO = new FundingDataVO(One, Two,marketOne, marketTwo, time, showOne, showTwo, markerOneVirtual, markerTwoVirtual, markerOneTotal, markerTwoTotal); return fundingDataVO; } @@ -350,5 +359,10 @@ public class FundingServiceImpl implements IFundingService { fundingMapper.deleteDate(id); fundingMapper.deleteZuser(id); } + + @Override + public List getMarketListByActivityId(Integer activityId) { + return 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 b9638aa..a9489fe 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 @@ -37,4 +37,6 @@ public interface ApiIFundingMapper { Integer selectStatusCount(); String selectMarket(Integer marketOne); + + LocalDate selectIsZhuli(Integer activityId, String jwcode, Integer marketSign); } 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 d5e1446..dcf1d63 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 @@ -191,6 +191,8 @@ public class ApiFundingServiceImpl implements ApiIFundingService { apiFundingVO.setMarketOne(marketOneName); apiFundingVO.setMarketTwo(marketTwoName); + apiFundingVO.setMarketOneId(marketOne); + apiFundingVO.setMarketTwoId(marketTwo); apiFundingVO.setMarketOneCount(oneShow); apiFundingVO.setMarketTwoCount(twoShow); apiFundingVO.setTotalcount(time); @@ -221,13 +223,20 @@ public class ApiFundingServiceImpl implements ApiIFundingService { LocalDateTime joinTime = LocalDateTime.now(); Integer marketSign = fundingRecordDto.getMarketSign(); Integer activityId = fundingRecordDto.getActivityId(); - //添加到数据库 - fundingMapper.addRecord(activityId, username, jwcode, marketSign, joinTime); + //获取最近的助力时间 + LocalDate zhulishijian= fundingMapper.selectIsZhuli(activityId, jwcode, marketSign); + if(zhulishijian==null || !zhulishijian.isEqual(LocalDate.now())){ + //添加到数据库 + fundingMapper.addRecord(activityId, username, jwcode, marketSign, joinTime); + }if(zhulishijian.isEqual(LocalDate.now())){ + return Result.failure("请勿重复助力"); + } + } catch (Exception e) { System.err.println("请求失败: " + e.getMessage()); } - return Result.success("助力成功"); + } } 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 d5059d4..c9feed1 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 @@ -214,6 +214,25 @@ FROM market WHERE id = #{id} + \ 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 1e2690d..a9a973a 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 @@ -83,6 +83,18 @@ WHERE id = #{marketOne} + \ No newline at end of file