修改代码

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;

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;

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<List<MarketVo>> getMarketList(@RequestParam Integer activityId) {
+        LOGGER.info("查看对应活动的市场列表");
+        List<MarketVo> marketList = fundingService.getMarketListByActivityId(activityId);
+        return Result.success(marketList);
+    }
+
 
 }

lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java

@@ -75,4 +75,6 @@ public interface IFundingMapper {
     Map<String, Object> getMarket(Integer activityId);
 
     String selectMarketName(Integer one);
+
+    List<MarketVo> getMarketListByActivityId(Integer activityId);
 }

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<MarketVo> getMarketListByActivityId(Integer activityId);
 }

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<String, Object> 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<String, Object> 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<MarketVo> getMarketListByActivityId(Integer activityId) {
+       return  fundingMapper.getMarketListByActivityId(activityId);
+    }
 }
 

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

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();
+            //获取最近的助力时间
+            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("助力成功");
+
     }
 
 }

lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml

@@ -214,6 +214,25 @@
         FROM market
         WHERE id = #{id}
     </select>
+    <select id="getMarketListByActivityId"  resultType="com.lottery.vo.MarketVo">
+        SELECT
+        market.id,
+        market.text as market
+        FROM
+        activity
+        LEFT JOIN market ON activity.market_one = market.id
+        WHERE
+        activity.id = #{activityId}
+        UNION
+        SELECT
+        market.id,
+        market.text as market
+        FROM
+        activity
+        LEFT JOIN market ON activity.market_two = market.id
+        WHERE
+        activity.id = #{activityId}
+    </select>
 
 
 </mapper>

lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml

@@ -83,6 +83,18 @@
         WHERE
             id = #{marketOne}
     </select>
+    <select id="selectIsZhuli" resultType="java.time.LocalDate">
+        SELECT
+            join_time
+        FROM
+            z_user
+        WHERE
+            activity_id = #{activityId}
+          and market_sign = #{marketSign}
+          and jwcode = #{jwcode}
+        order by join_time desc
+            LIMIT 1
+    </select>
 
 
 </mapper>