修改市场id导致的获取接口

lottery-system/lottery-pojo/src/main/java/com/lottery/dto/FundingRecordDto.java

@@ -15,5 +15,5 @@ public class FundingRecordDto {
 
     private Integer activityId;
 
-    private String marketSign;
+    private Integer marketSign;
 }

lottery-system/lottery-pojo/src/main/java/com/lottery/vo/ApiFundingTimeVo.java

@@ -14,8 +14,8 @@ import java.time.LocalDate;
  **/
 @Data
 public class ApiFundingTimeVo {
-    private String marketOne;
-    private String marketTwo;
+    private Integer marketOne;
+    private Integer marketTwo;
     private LocalDate startTime;
     private LocalDate endTime;
 }

lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingActivityVo.java

@@ -17,6 +17,7 @@ import java.util.Date;
 public class FundingActivityVo {
     private Integer id;
     private String activityName;  // 活动名称
+
     private String marketOne;     // 市场一(如USA)
     private String marketTwo;     // 市场二(如HK)
     private Integer status;       // 状态(1-启用,0-禁用)

lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java

@@ -3,6 +3,7 @@ package com.lottery.api.mapper;
 import com.lottery.vo.ApiFundingTimeVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import javax.persistence.criteria.CriteriaBuilder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -19,19 +20,21 @@ import java.util.Map;
 public interface ApiIFundingMapper {
 
 
-    Integer getTime(Integer activityId, String markerSign);
+    Integer getTime(Integer activityId, Integer markerSign);
 
-    Integer searchVirtual(Integer activityId, String marketSign);
+    Integer searchVirtual(Integer activityId, Integer marketSign);
 
-    Integer searchMarketTotal(Integer activityId, String marketSign);
+    Integer searchMarketTotal(Integer activityId, Integer marketSign);
 
     ApiFundingTimeVo getMarket(Integer activityId);
 
     Integer selectStatus();
 
-    void addRecord(Integer activityId, String username, String jwcode, String marketSign, LocalDateTime joinTime);
+    void addRecord(Integer activityId, String username, String jwcode, Integer marketSign, LocalDateTime joinTime);
 
-    LocalDate selectCount(String jwcode, String marketSign,Integer activityId);
+    LocalDate selectCount(String jwcode, Integer marketSign,Integer activityId);
 
     Integer selectStatusCount();
+
+    String selectMarket(Integer marketOne);
 }

lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java

@@ -45,9 +45,8 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
         //根据活动id查询俩个市场,俩个市场是一条数据
         ApiFundingTimeVo data= fundingMapper.getMarket(activityId);
 
-
-        String marketOne = (String) data.getMarketOne();
-        String marketTwo = (String) data.getMarketTwo();
+        Integer marketOne = data.getMarketOne();
+        Integer marketTwo = data.getMarketTwo();
         LocalDate startTime = (LocalDate) data.getStartTime();
         LocalDate endTime = (LocalDate) data.getEndTime();
 
@@ -81,8 +80,14 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
 
         ApiFundingVO apiFundingVO = new ApiFundingVO();
 
-        apiFundingVO.setMarketOne(marketOne);
-        apiFundingVO.setMarketTwo(marketTwo);
+        //
+        String marketOneName = fundingMapper.selectMarket(marketOne);
+        String marketTwoName = fundingMapper.selectMarket(marketTwo);
+
+        apiFundingVO.setMarketOne(marketOneName);
+        apiFundingVO.setMarketTwo(marketTwoName);
+
+
         apiFundingVO.setMarketOneCount(oneShow);
         apiFundingVO.setMarketTwoCount(twoShow);
         apiFundingVO.setTotalcount(time);
@@ -112,8 +117,8 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
         ApiFundingTimeVo data= fundingMapper.getMarket(activityId);
 
 
-        String marketOne = (String) data.getMarketOne();
-        String marketTwo = (String) data.getMarketTwo();
+        Integer marketOne = data.getMarketOne();
+        Integer marketTwo = data.getMarketTwo();
         LocalDate startTime = (LocalDate) data.getStartTime();
         LocalDate endTime = (LocalDate) data.getEndTime();
 
@@ -180,8 +185,12 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
 
         ApiFundingVO apiFundingVO = new ApiFundingVO();
 
-        apiFundingVO.setMarketOne(marketOne);
-        apiFundingVO.setMarketTwo(marketTwo);
+
+        String marketOneName = fundingMapper.selectMarket(marketOne);
+        String marketTwoName = fundingMapper.selectMarket(marketTwo);
+        apiFundingVO.setMarketOne(marketOneName);
+        apiFundingVO.setMarketTwo(marketTwoName);
+
         apiFundingVO.setMarketOneCount(oneShow);
         apiFundingVO.setMarketTwoCount(twoShow);
         apiFundingVO.setTotalcount(time);
@@ -210,7 +219,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
             String username = rootNode.path("data").path("username").asText();
             String jwcode = rootNode.path("data").path("jwcode").asText();
             LocalDateTime joinTime = LocalDateTime.now();
-            String marketSign = fundingRecordDto.getMarketSign();
+            Integer marketSign = fundingRecordDto.getMarketSign();
             Integer activityId = fundingRecordDto.getActivityId();
             //添加到数据库
             fundingMapper.addRecord(activityId, username, jwcode, marketSign, joinTime);

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

@@ -72,10 +72,10 @@
     </delete>
 
     <select id="getFundingActivity" resultType="com.lottery.vo.FundingActivityVo">
-        SELECT id,
+        SELECT activity.id,
                activity_name,
-               market_one,
-               market_two,
+               m1.text As marketOne,
+               m2.text As marketTwo,
                status,
                start_time,
                end_time,
@@ -84,6 +84,8 @@
                    ELSE '禁用'
                    END
         FROM activity
+            left join market  m1 on activity.market_one = m1.id
+            left join market  m2 on activity.market_two = m2.id
         ORDER BY created_time DESC
     </select>
     <select id="searchcount" resultType="java.lang.Integer">

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

@@ -75,6 +75,14 @@
         WHERE
             status = 1
     </select>
+    <select id="selectMarket" resultType="java.lang.String">
+        SELECT
+            text
+        FROM
+            market
+        WHERE
+            id = #{marketOne}
+    </select>
 
 
 </mapper>