diff --git a/lottery-system/.idea/.cache/.Apifox_Helper/.toolWindow.db b/lottery-system/.idea/.cache/.Apifox_Helper/.toolWindow.db
new file mode 100644
index 0000000..fee1a05
Binary files /dev/null and b/lottery-system/.idea/.cache/.Apifox_Helper/.toolWindow.db differ
diff --git a/lottery-system/.idea/ApifoxUploaderProjectSetting.xml b/lottery-system/.idea/ApifoxUploaderProjectSetting.xml
new file mode 100644
index 0000000..7895ad6
--- /dev/null
+++ b/lottery-system/.idea/ApifoxUploaderProjectSetting.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 bc0dd1a..a0c0db3 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
@@ -70,6 +70,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())) {