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 2502a2d..6b5ae41 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 @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.time.LocalDate; import java.util.Date; @@ -19,6 +20,7 @@ import java.util.Date; public class FundingActivityDto { @NotNull(message = "活动名称不能为空") + @Size(min = 1, max = 20, message = "活动名称长度必须在 1 到 20 个字符之间") private String activityName; // 活动名称 @NotNull(message = "市场一不能为空") private Integer marketOne; // 市场一(如USA) 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 b369718..87b92c2 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 @@ -83,4 +83,6 @@ public interface IFundingMapper { Integer selectmarket(Integer id); Integer selectmarketCount(Integer market); + + Integer selectActivityStatus(Integer id); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java index 866ccf8..c11409d 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminGradeServiceImpl.java @@ -78,11 +78,11 @@ public class AdminGradeServiceImpl extends ServiceImpl .orderByAsc(Grade::getId); //sort一样按照id排序 Page gradePage = this.page(page, gradeLambdaQueryWrapper); - List gradeVos = ConvertBeanUtil.convertList(gradePage.getRecords(), GradeVo.class); return PageInfo.of(gradePage, gradeVos); } + @Override public List selectAllGrade() { // List GradeNameList = new ArrayList<>(); 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 3c89c38..c750317 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 @@ -106,6 +106,7 @@ public class FundingServiceImpl implements IFundingService { //查询市场是否存在 Integer count = fundingMapper.selectmarketCount(fundingActivityDto.getMarketOne()); Integer count2 = fundingMapper.selectmarketCount(fundingActivityDto.getMarketTwo()); + if(count == 0){ return Result.failure("市场一不存在"); } @@ -435,6 +436,11 @@ public class FundingServiceImpl implements IFundingService { @Transactional(rollbackOn = SQLException.class) public Result deleteActivity(Integer id) { + //查看活动的状态 + Integer status = fundingMapper.selectActivityStatus(id); + if(status != 0){ + return Result.failure("活动正在运行中,请禁用再删除"); + } //产看股票是否存在 Integer count = fundingMapper.selectActivityCount(id); 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 26ad88e..d24a3cf 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 @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.lottery.api.mapper.ApiIFundingMapper; import com.lottery.api.service.ApiIFundingService; +import com.lottery.config.ApiConfig; import com.lottery.dto.FundingRecordDto; import com.lottery.result.Result; import com.lottery.utils.HttpUtils; @@ -38,6 +39,8 @@ public class ApiFundingServiceImpl implements ApiIFundingService { @Autowired ObjectMapper objectMapper = new ObjectMapper(); + @Autowired + ApiConfig apiConfig; @Override public Result getActivityDetailOne(String token) { @@ -49,17 +52,13 @@ public class ApiFundingServiceImpl implements ApiIFundingService { if (count == null || count == 0 || count > 1) { // 根据业务逻辑，这里可以分别处理count为null、小于0和大于1的情况 // 但为了简化示例，我们统一返回一个失败结果 - return Result.failure(200,"操作成功"); + return Result.failure(400,"活动未开启"); } Integer activityId = fundingMapper.selectStatus(); - - - //根据活动id查询俩个市场,俩个市场是一条数据 ApiFundingTimeVo data= fundingMapper.getMarket(activityId); - Integer marketOne = data.getMarketOne(); Integer marketTwo = data.getMarketTwo(); LocalDate startTime = (LocalDate) data.getStartTime(); @@ -70,7 +69,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService { try { // 1. 定义请求 URL - String url = "http://39.101.133.168:8828/hljw/api/v2/member/info"; + String url = apiConfig.getHljwUrl() +"/api/v2/member/info"; // 准备请求参数 Map params = new HashMap<>(); @@ -78,6 +77,9 @@ public class ApiFundingServiceImpl implements ApiIFundingService { // 调用接口 String response = HttpUtils.postUrlencoded(url, params); JsonNode rootNode = objectMapper.readTree(response); + if(rootNode.path("code").asInt() == 401){ + return Result.failure("登录凭证错误"); + } // 提取 username username = rootNode.path("data").path("username").asText(); jwcode = rootNode.path("data").path("jwcode").asText(); @@ -169,7 +171,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService { try { // 1. 定义请求 URL - String url = "http://39.101.133.168:8828/hljw/api/v2/member/info"; + String url = apiConfig.getHljwUrl() + "/api/v2/member/info"; // 准备请求参数 Map params = new HashMap<>(); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/config/ApiConfig.java b/lottery-system/lottery-service/src/main/java/com/lottery/config/ApiConfig.java new file mode 100644 index 0000000..433134d --- /dev/null +++ b/lottery-system/lottery-service/src/main/java/com/lottery/config/ApiConfig.java @@ -0,0 +1,28 @@ +package com.lottery.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @program: lottery-system + * @ClassName ApiConfig + * @description: + * @author:jihaipeng + * @create: 2025−07-25 13:00 + * @Version 1.0 + **/ +@Component +@ConfigurationProperties(prefix = "api") +public class ApiConfig { + private String hljwUrl; // 自动匹配当前环境的 api.hljw-url + + // Getter & Setter（必须提供，否则绑定失败） + public String getHljwUrl() { + return hljwUrl; + } + + public void setHljwUrl(String hljwUrl) { + this.hljwUrl = hljwUrl; + } +} \ No newline at end of file diff --git a/lottery-system/lottery-service/src/main/resources/application-dev.yml b/lottery-system/lottery-service/src/main/resources/application-dev.yml index 77666aa..ba3eab7 100644 --- a/lottery-system/lottery-service/src/main/resources/application-dev.yml +++ b/lottery-system/lottery-service/src/main/resources/application-dev.yml @@ -30,6 +30,6 @@ spring: max-idle: 20 # 最大空闲连接 min-idle: 10 # 最小空闲连接 - - +api: + hljw-url: "http://39.101.133.168:8828/hljw" diff --git a/lottery-system/lottery-service/src/main/resources/application-prod.yml b/lottery-system/lottery-service/src/main/resources/application-prod.yml index a94c1e2..53490ed 100644 --- a/lottery-system/lottery-service/src/main/resources/application-prod.yml +++ b/lottery-system/lottery-service/src/main/resources/application-prod.yml @@ -31,6 +31,8 @@ spring: min-idle: 10 # 最小空闲连接 - +# 不同环境的 API 路径配置 +api: + hljw-url: "http://api.homilychart.com/hljw" 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 5208074..9300783 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 @@ -250,5 +250,13 @@ from market where id = #{market} + \ No newline at end of file