From b8dd58bbd5228beff127bbc8fc1e2c3190886dd9 Mon Sep 17 00:00:00 2001 From: jihaipeng <3204568531@qq.com> Date: Wed, 23 Jul 2025 15:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.idea/.cache/.Apifox_Helper/.toolWindow.db | Bin 188416 -> 212992 bytes .../admin/controller/AdminGradeController.java | 3 ++- .../admin/controller/AdminUserController.java | 1 + .../admin/service/Impl/AdminGradeServiceImpl.java | 3 ++- .../admin/service/Impl/FundingServiceImpl.java | 7 ++++++- .../api/service/Impl/ApiFundingServiceImpl.java | 2 +- .../com/lottery/interceptor/AuthInterceptor.java | 5 ++++- 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/lottery-system/.idea/.cache/.Apifox_Helper/.toolWindow.db b/lottery-system/.idea/.cache/.Apifox_Helper/.toolWindow.db index 0949c3cc413c95ff71648f0a9e7bd53bd7ad1da1..fee1a05bb2fec9db83ebb87b551af77f8b6591a2 100644 GIT binary patch delta 23194 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 diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java index 79b1b54..e127e02 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java @@ -12,6 +12,7 @@ import com.lottery.utils.ConvertBeanUtil; import com.lottery.vo.GradeSimpleVo; import com.lottery.vo.GradeVo; import com.lottery.vo.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +34,7 @@ import java.util.List; **/ //TODo 删除等级时 把奖品表关联删除。。删除用户表时，把内定用户表关联删除，，，，增加内定多一个逻辑：如果增加的内定用户已存在表中，增加失败（其实就是一个用户只能内定一个等级） + @RestController @RequestMapping("/admin/grade") public class AdminGradeController { @@ -45,7 +47,6 @@ public class AdminGradeController { private final static Logger LOGGER = LoggerFactory.getLogger(AdminGradeController.class); - @PostMapping("/list") public Result> selectGrade(@RequestBody PageSimpleDto pageSimpleDto){ if (pageSimpleDto.getPageNum() == null) { diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java index 1493603..fecb913 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java @@ -68,6 +68,7 @@ public class AdminUserController { if (userQueryDto.getPageSize() == null) { userQueryDto.setPageSize(10); } + return Result.success(adminUserService.listUser(userQueryDto.getPageNum(), userQueryDto.getPageSize(), userQueryDto)); } 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 ebdd90b..f8f18e8 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,6 +78,7 @@ 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); } @@ -91,8 +92,8 @@ public class AdminGradeServiceImpl extends ServiceImpl @Override public boolean saveGrade(GradeDto gradeDto) { - Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class); + Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class); grade.setRemainNum(gradeDto.getAmount()); grade.setCreateTime(new Date()); grade.setUpdateTime(new Date()); 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 3f886be..f797211 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 @@ -299,8 +299,13 @@ public class FundingServiceImpl implements IFundingService { if(marketCount ==null || marketCount == 0){ return Result.failure("所要设置市场不存在"); } - fundingMapper.setVirtual(activityId, stock, addTotal); + //查询当前总的助力数 + Integer total = fundingMapper.searchMarketTotal(activityId,stock); + if(total + addTotal >= 1500){ + return Result.failure("所在市场助力值最大1500"); + } + fundingMapper.setVirtual(activityId, stock, addTotal); return Result.success("设置虚拟次数成功"); } 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 049f7d6..45f8773 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 @@ -49,7 +49,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService { if (count == null || count == 0 || count > 1) { // 根据业务逻辑，这里可以分别处理count为null、小于0和大于1的情况 // 但为了简化示例，我们统一返回一个失败结果 - return Result.failure("活动数量不符合要求，请检查打开或关闭多余的活动"); + return Result.failure(200,"操作成功"); } Integer activityId = fundingMapper.selectStatus(); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/interceptor/AuthInterceptor.java b/lottery-system/lottery-service/src/main/java/com/lottery/interceptor/AuthInterceptor.java index 210bb3b..df45a9d 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/interceptor/AuthInterceptor.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/interceptor/AuthInterceptor.java @@ -40,7 +40,10 @@ public class AuthInterceptor implements HandlerInterceptor { if("/api/user/list".equals(request.getRequestURI())) { return true; } - if("/admin/win/list".equals(request.getRequestURI())) { +// if("/admin/win/list".equals(request.getRequestURI())) { +// return true; +// } + if("/api/winUser/list".equals(request.getRequestURI())) { return true; } if("/api/lottery/start".equals(request.getRequestURI())) {