Merge branch 'milestone-20250723-wwl' into wuweili/feature-20250715095139-抽奖众筹

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

@@ -18,8 +18,8 @@ import java.util.Date;
 public class FundingActivityDto {
 
     private String activityName;  // 活动名称
-    private String marketOne;     // 市场一(如USA)
-    private String marketTwo;     // 市场二(如HK)
+    private Integer marketOne;     // 市场一(如USA)
+    private Integer marketTwo;     // 市场二(如HK)
     private Integer status;       // 状态(1-启用,0-禁用)
     private LocalDate startTime;       // 活动开始时间
     private LocalDate  endTime;         // 活动结束时间

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/dto/FundingUserDto.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 public class FundingUserDto {
     public Integer activityId;
 
-    private String marketSign;    // 市场标识(usa/hk)
+    private Integer marketSign;    // 市场标识(usa/hk)
     private String username;      // 用户名
     private String jwcode;        // 用户唯一码
     private Integer page=1;

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

@@ -0,0 +1,22 @@
+package com.lottery.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: lottery-system
+ * @ClassName VriableAdd
+ * @description:
+ * @author:jihaipeng
+ * @create: 2025−07-18 19:17
+ * @Version 1.0
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VriableAddDto {
+    private Integer activityId;
+    private Integer stock;
+    private Integer addTotal;
+}

lottery-system/lottery-pojo/src/main/java/com/lottery/entity/Activity.java

@@ -27,8 +27,8 @@ public class Activity {
     private Integer id;
 
     private String activityName;  // 活动名称
-    private String marketOne;     // 市场一(如USA)
-    private String marketTwo;     // 市场二(如HK)
+    private Integer marketOne;     // 市场一(如USA)
+    private Integer marketTwo;     // 市场二(如HK)
     private Integer status;       // 状态(1-启用,0-禁用)
     @TableField(value = "create_time", fill = FieldFill.INSERT) // 自动填充创建时间
     private LocalDateTime createdTime;     // 创建时间

lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingExport.java

@@ -29,7 +29,7 @@ public class FundingExport {
     @ExcelProperty("精网号")  // 定义 Excel 表头为“用户唯一码”
     private String jwcode;        // 用户唯一码
     @ExcelProperty("市场")  // 定义 Excel 表头为“市场标识”
-    private String marketSign;    // 市场标识(usa/hk)
+    private String text;    // 市场标识(usa/hk)
 
     @ExcelProperty("参与时间")  // 定义 Excel 表头为“参与时间”
     private LocalDateTime joinTime;        // 参与时间

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/ApiFundingVO.java

@@ -21,6 +21,6 @@ public class ApiFundingVO {
     private Integer Totalcount;
     private Integer marketOneCount;
     private Integer marketTwoCount;
-    private String marketAddOne;
-    private String marketAddTwo;
+    private String marketOneStatus;
+    private String marketTwoStatus;
 }

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-pojo/src/main/java/com/lottery/vo/FundingUserVo.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 public class FundingUserVo {
     @TableId(type = IdType.AUTO) // 主键自增策略
     private Integer id;
-    private String marketSign;    // 市场标识(usa/hk)
+    private String text;    // 市场标识(usa/hk)
     private String username;      // 用户名
     private String jwcode;        // 用户唯一码
     private LocalDateTime joinTime;        // 参与时间

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

@@ -0,0 +1,21 @@
+package com.lottery.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: lottery-system
+ * @ClassName marketVo
+ * @description:
+ * @author:jihaipeng
+ * @create: 2025−07-18 17:37
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MarketVo {
+    private Integer id;
+    private String market;
+}

lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/FundingController.java

@@ -5,22 +5,21 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lottery.dto.FundingActivityDto;
 import com.lottery.admin.service.IFundingService;
-import com.lottery.dto.FundingRecordDto;
 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;
+import com.lottery.vo.MarketVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.List;
 import java.util.Map;
 
@@ -40,8 +39,7 @@ public class FundingController {
     private IFundingService fundingService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(FundingController.class);
-    @Autowired
-    private ProjectInfoAutoConfiguration projectInfoAutoConfiguration;
+
 
     /**
      * 获取所有众筹活动
@@ -82,7 +80,6 @@ public class FundingController {
     @PostMapping("/addActivity")
     public Result<String> addActivity(@Validated @RequestBody FundingActivityDto fundingActivityDto) {
         LOGGER.info("添加活动，参数为{}", fundingActivityDto);
-
             return fundingService.addActivity(fundingActivityDto);
 
     }
@@ -102,6 +99,9 @@ public class FundingController {
     @PostMapping("/getActivityDate")
     public Result<Map<String, Object>> getActivityDate(@RequestParam Integer activityId) {
         LOGGER.info("接口getActivityDate查询后台数据统计,活动id为{}", activityId);
+        if(fundingService.getActivityDate(activityId)==null){
+            return Result.failure("活动不存在，查询失败");
+        }
         return Result.success(fundingService.getActivityDate(activityId));
     }
 
@@ -111,7 +111,7 @@ public class FundingController {
 //        return fundingService.addRecord(fundingRecordDto);
 //    }
 
-    //设置活动初始活动
+    //设置活动初始时间
     @PostMapping("/setActivityTime")
     public Result<String> setActivityTime(@RequestParam Integer activityId, @RequestParam Integer time) {
         LOGGER.info("设置id={}的活动初始时间为{}", activityId, time);
@@ -120,8 +120,12 @@ public class FundingController {
 
     //添加虚拟次数
     @PostMapping("/addDateVirtual")
-    public Result<String> addVirtual(@RequestParam Integer activityId, @RequestParam String stock, @RequestParam Integer addTotal) {
-        LOGGER.info("添加虚拟次数,id={},stock={},addTotal={}", activityId, stock, addTotal);
+    public Result<String> addVirtual(@RequestBody VriableAddDto vriableAddDto) {
+        LOGGER.info("添加虚拟次数");
+        Integer activityId = vriableAddDto.getActivityId();
+        Integer stock = vriableAddDto.getStock();
+        Integer addTotal = vriableAddDto.getAddTotal();
+
         return fundingService.addVirtual(activityId, stock, addTotal);
     }
 
@@ -143,7 +147,7 @@ public class FundingController {
 
     //获取市场股票列表
     @GetMapping("/getMarketList")
-    public Result<List> getMarket() {
+    public Result<List<MarketVo>> getMarket() {
         LOGGER.info("获取市场股票列表");
         return Result.success(fundingService.getMarketList());
     }
@@ -155,5 +159,13 @@ public class FundingController {
         fundingService.exportActivityData(fundingUserDto,response);
     }
 
+    //删除活动
+    @PostMapping("/deleteActivity")
+    public Result<String> deleteActivity(@RequestParam Integer activityId) {
+        LOGGER.info("删除活动：{}",activityId);
+        fundingService.deleteActivity(activityId);
+        return Result.success("删除成功");
+    }
+
 
 }

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

@@ -4,6 +4,7 @@ import com.lottery.entity.Activity;
 import com.lottery.entity.FundingExport;
 import com.lottery.vo.FundingActivityVo;
 import com.lottery.vo.FundingUserVo;
+import com.lottery.vo.MarketVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.time.LocalDateTime;
@@ -28,38 +29,50 @@ public interface IFundingMapper {
     void addActivity(Activity activity);
 
 
-    List<FundingUserVo> selectByCondition(Integer activityId, String username, String jwcode, String marketSign, Integer pagesize, int offset);
+    List<FundingUserVo> selectByCondition(Integer activityId, String username, String jwcode, Integer marketSign, Integer pagesize, int offset);
 
 
-    int searchcount(Integer activityId, String username, String jwcode, String marketSign);
+    int searchcount(Integer activityId, String username, String jwcode, Integer marketSign);
 
     Integer searchPeopleTotal(Integer activityId);
 
 
-    Map<String, Object> getMarket(Integer activityId);
 
 
-    Integer searchMarketPeople(Integer activityId, String marketSign);
 
-    Integer searchMarketTotal(Integer activityId, String marketSign);
+    Integer searchMarketPeople(Integer activityId, Integer marketSign);
+
+    Integer searchMarketTotal(Integer activityId, Integer marketSign);
 
 //    void addRecord(Integer activityId, String username, String jwcode, String marketSign, LocalDateTime joinTime);
 
     void setActivityDate(Integer activityId, Integer time);
 
-    void addDate(Integer time, String stock, Integer addTotal, Integer activityId);
+    void addDate(Integer time, Integer stock, Integer addTotal, Integer activityId);
 
-    void setVirtual(Integer activityId, String stock, Integer addTotal);
+    void setVirtual(Integer activityId, Integer stock, Integer addTotal);
 
-    Integer searchVirtual(Integer activityId, String stock);
+    Integer searchVirtual(Integer activityId, Integer stock);
 
-    Integer getTime(Integer activityId, String stock);
+    Integer getTime(Integer activityId, Integer stock);
 
-    List<String>  getMarketList();
+    List<MarketVo>  getMarketList();
 
     Integer selectStatus();
 
     String selectActivityName(Integer activityId);
 
-    List<FundingExport> selectByConditionExport(Integer activityId, String username, String jwcode, String marketSign);
+    List<FundingExport> selectByConditionExport(Integer activityId, String username, String jwcode, Integer marketSign);
+
+    Integer selectCount(Integer activityId);
+
+    void deleteActivity(Integer id);
+
+    void deleteDate(Integer id);
+
+    void deleteZuser(Integer id);
+
+    Map<String, Object> getMarket(Integer activityId);
+
+    String selectMarketName(Integer one);
 }

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/IFundingService.java

@@ -1,12 +1,11 @@
 package com.lottery.admin.service;
 
 import com.lottery.dto.FundingActivityDto;
-import com.lottery.dto.FundingRecordDto;
 import com.lottery.dto.FundingUserDto;
 import com.lottery.result.Result;
 import com.lottery.vo.FundingActivityVo;
 import com.lottery.vo.FundingDataVO;
-import com.lottery.vo.FundingUserVo;
+import com.lottery.vo.MarketVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -39,12 +38,13 @@ public interface IFundingService {
 
     Result<String> setActivityTime(Integer activityId, Integer time);
 
-    Result<String> addVirtual(Integer activityId, String stock, Integer addTotal);
+    Result<String> addVirtual(Integer activityId, Integer stock, Integer addTotal);
 
     FundingDataVO getDate1(Integer activityId);
 
-    List getMarketList();
+     List<MarketVo> getMarketList();
 
     void exportActivityData(FundingUserDto fundingUserDto, HttpServletResponse response) throws IOException;
 
+    void deleteActivity(Integer activityId);
 }

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java

@@ -2,10 +2,8 @@ package com.lottery.admin.service.Impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lottery.dto.FundingActivityDto;
-import com.lottery.dto.FundingRecordDto;
 import com.lottery.dto.FundingUserDto;
 import com.lottery.entity.Activity;
 import com.lottery.admin.mapper.IFundingMapper;
@@ -13,17 +11,16 @@ import com.lottery.admin.service.IFundingService;
 import com.lottery.entity.FundingExport;
 import com.lottery.result.Result;
 import com.lottery.utils.ConvertBeanUtil;
-import com.lottery.utils.HttpUtils;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -96,7 +93,7 @@ public class FundingServiceImpl implements IFundingService {
         if (fundingActivityDto.getEndTime().isBefore(ChronoLocalDate.from(now))) {
             return Result.failure("结束时间不能早于当前时间");
         }
-        if(fundingActivityDto.getMarketOne().equals(fundingActivityDto.getMarketTwo())){
+        if(fundingActivityDto.getMarketOne()==(fundingActivityDto.getMarketTwo())){
             if(fundingMapper.selectStatus()==1){
                 return Result.failure("市场添加重复");
             }
@@ -104,6 +101,9 @@ public class FundingServiceImpl implements IFundingService {
         //查询状态
         Integer status = fundingMapper.selectStatus();
         Integer statuss = fundingActivityDto.getStatus();
+
+
+
         if(statuss == 1){
             if(status >= 1){
                 return Result.failure("当前有活动正在进行,新添加活动状态应为禁用");
@@ -117,8 +117,9 @@ public class FundingServiceImpl implements IFundingService {
         activity.setUpdatedTime(creatTime);
         fundingMapper.addActivity(activity);
 
-        String one = fundingActivityDto.getMarketOne();
-        String two = fundingActivityDto.getMarketTwo();
+        Integer one = fundingActivityDto.getMarketOne();
+        Integer two = fundingActivityDto.getMarketTwo();
+
         Integer activityId = activity.getId();
         Integer time = 0;
         Integer addTotal = 0;
@@ -150,6 +151,7 @@ public class FundingServiceImpl implements IFundingService {
                 fundingUserDto.getJwcode(),
                 fundingUserDto.getMarketSign()
         );
+
         // 构建返回结果
         Map<String, Object> result = new HashMap<>();
         result.put("list", list);
@@ -165,11 +167,16 @@ public class FundingServiceImpl implements IFundingService {
 
         //参与总人数
         Integer people_total = fundingMapper.searchPeopleTotal(activityId);
+
         //根据活动id查询俩个市场,俩个市场是一条数据
         Map<String, Object> market = fundingMapper.getMarket(activityId);
+
+        if(market == null){
+            return null;
+        }
         //获取map
-        String marketOne = (String) market.get("market_one");
-        String marketTwo = (String) market.get("market_two");
+        Integer marketOne =(Integer) market.get("market_one");
+        Integer marketTwo = (Integer) market.get("market_two");
         //参与市场一的人数
         Integer markerOnePeople = fundingMapper.searchMarketPeople(activityId, marketOne);
         //市场一的总的助力次数
@@ -222,6 +229,11 @@ public class FundingServiceImpl implements IFundingService {
 
     @Override
     public Result<String> setActivityTime(Integer activityId, Integer time) {
+        //检验activity Id存在
+        Integer status = fundingMapper.selectCount(activityId);
+        if(status ==null || status == 0){
+            return Result.failure("活动不存在");
+        }
         if(time == null){
             return Result.failure("初始时间不能为空");
         }
@@ -233,13 +245,16 @@ public class FundingServiceImpl implements IFundingService {
     }
 
     @Override
-    public Result<String> addVirtual(Integer activityId, String stock, Integer addTotal) {
+    public Result<String> addVirtual(Integer activityId, Integer stock, Integer addTotal) {
         if(addTotal == null){
             return Result.failure("添加次数不能为空");
         }
         if(!ValidationUtils.validateInteger(addTotal)){
             return Result.failure("添加次数格式错误");
         }
+        if(stock == null){
+            return Result.failure("库存不能为空");
+        }
         fundingMapper.setVirtual(activityId, stock, addTotal);
 
         return Result.success("设置虚拟次数成功");
@@ -247,25 +262,44 @@ public class FundingServiceImpl implements IFundingService {
 
     @Override
     public FundingDataVO getDate1(Integer activityId) {
+
         //根据活动id查询俩个市场,俩个市场是一条数据
         Map<String, Object> market = fundingMapper.getMarket(activityId);
         //获取map
-        String marketOne = (String) market.get("market_one");
+        Integer One = (Integer) market.get("market_one");
+        //根据id查名称
+        String marketOne = fundingMapper.selectMarketName(One);
         //市场一的总的助力次数
-        Integer markerOneTotal = fundingMapper.searchMarketTotal(activityId, marketOne);
+        Integer markerOneTotal = fundingMapper.searchMarketTotal(activityId, One);
+        if(markerOneTotal == null){
+            markerOneTotal = 0;
+        }
+
         //市场一的虚拟次数
-        Integer markerOneVirtual = fundingMapper.searchVirtual(activityId, marketOne);
+        Integer markerOneVirtual = fundingMapper.searchVirtual(activityId, One);
+        if(markerOneVirtual == null){
+            markerOneVirtual = 0;
+        }
+
+        Integer Two = (Integer) market.get("market_two");
+        String marketTwo = fundingMapper.selectMarketName(Two);
 
-        String marketTwo = (String) market.get("market_two");
         //市场二的总的助力次数
-        Integer markerTwoTotal = fundingMapper.searchMarketTotal(activityId, marketTwo);
+        Integer markerTwoTotal = fundingMapper.searchMarketTotal(activityId, Two);
+        if(markerTwoTotal == null){
+            markerTwoTotal = 0;
+        }
         //市场二的虚拟次数
-        Integer markerTwoVirtual = fundingMapper.searchVirtual(activityId, marketTwo);
+        Integer markerTwoVirtual = fundingMapper.searchVirtual(activityId, Two);
+        if(markerTwoVirtual != null ){
+            markerTwoVirtual = 0;
+        }
 
         Integer showOne = markerOneTotal + markerOneVirtual;
         Integer showTwo = markerTwoTotal + markerTwoVirtual;
 
-        Integer time = fundingMapper.getTime(activityId,marketOne);
+        Integer time = fundingMapper.getTime(activityId,One);
+
         Map<String, Object> result = new HashMap<>();
 
         FundingDataVO fundingDataVO = new FundingDataVO(marketOne, marketTwo, time, showOne, showTwo, markerOneVirtual, markerTwoVirtual, markerOneTotal, markerTwoTotal);
@@ -274,7 +308,7 @@ public class FundingServiceImpl implements IFundingService {
     }
 
     @Override
-    public List getMarketList() {
+    public List<MarketVo> getMarketList() {
         return fundingMapper.getMarketList();
     }
 
@@ -309,5 +343,12 @@ public class FundingServiceImpl implements IFundingService {
                 .sheet(activityName+"用户助力统计")
                 .doWrite(list);
     }
+
+    @Override
+    public void deleteActivity(Integer id) {
+        fundingMapper.deleteActivity(id);
+        fundingMapper.deleteDate(id);
+        fundingMapper.deleteZuser(id);
+    }
 }
 

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,15 +185,19 @@ 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);
         apiFundingVO.setStartTime(startTime);
         apiFundingVO.setEndTime(endTime);
-        apiFundingVO.setMarketAddOne(markeroneadd);
-        apiFundingVO.setMarketTwo(marketTwoadd);
+        apiFundingVO.setMarketOneStatus(markeroneadd);
+        apiFundingVO.setMarketTwoStatus(marketTwoadd);
         return Result.success(apiFundingVO);
     }
 
@@ -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

@@ -58,12 +58,24 @@
         where activity_id = #{activityId}
           and stock = #{stock}
     </update>
+    <delete id="deleteActivity">
+        DELETE FROM activity
+        WHERE id = #{id}
+    </delete>
+    <delete id="deleteDate">
+        DELETE FROM data
+        WHERE activity_id = #{activityId}
+    </delete>
+    <delete id="deleteZuser">
+        DELETE FROM z_user
+        WHERE activity_id = #{activityId}
+    </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,
@@ -72,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">
@@ -92,9 +106,9 @@
     </select>
     <select id="selectByCondition" resultType="com.lottery.vo.FundingUserVo">
         SELECT
-        id, activity_id, username, jwcode, market_sign, join_time
+        z_user.id, activity_id, username, jwcode, market.text, join_time
         FROM
-        z_user
+        z_user left join market on z_user.market_sign = market.id
         WHERE
         activity_id = #{activityId}
         <if test="username != null and username != ''">
@@ -109,17 +123,15 @@
         ORDER BY join_time DESC
         LIMIT #{pagesize} OFFSET #{offset}
     </select>
+
     <select id="searchPeopleTotal" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         SELECT COUNT(DISTINCT jwcode)
         FROM z_user
         WHERE activity_id = #{activityId}
     </select>
-    <select id="getMarket" resultType="java.util.Map" parameterType="java.lang.Integer">
-        SELECT market_one,
-               market_two
-        FROM activity
-        WHERE id = #{activityId}
-    </select>
+
+
+
     <select id="searchMarketPeople" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT jwcode)
         FROM z_user
@@ -142,10 +154,7 @@
             activity_id = #{activityId}
           and stock = #{stock}
     </select>
-    <select id="getMarketList" resultType="string">
-        SELECT text
-        FROM market
-    </select>
+
     <select id="selectStatus" resultType="java.lang.Integer">
         SELECT count(*)
         FROM activity
@@ -166,9 +175,9 @@
 
         <select id="selectByConditionExport" resultType="com.lottery.entity.FundingExport">
         SELECT
-        username, jwcode, market_sign, join_time
+        username, jwcode, market.text, join_time
         FROM
-        z_user
+        z_user left join market on z_user.market_sign = market.id
         WHERE
         activity_id = #{activityId}
         <if test="username != null and username != ''">
@@ -182,6 +191,29 @@
         </if>
         ORDER BY join_time DESC
     </select>
+    <select id="selectCount" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM data
+        WHERE activity_id = #{activityId}
+    </select>
+    <select id="getMarketList" resultType="com.lottery.vo.MarketVo">
+        SELECT
+        id,
+        text as market
+        FROM
+        market
+    </select>
+    <select id="getMarket" resultType="java.util.Map">
+        SELECT market_one,
+               market_two
+        FROM activity
+        WHERE id = #{activityId}
+    </select>
+    <select id="selectMarketName" resultType="java.lang.String">
+        SELECT text
+        FROM market
+        WHERE id = #{id}
+    </select>
 
 
 </mapper>

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>