Merge branch 'milestone-20250723-wwl' of http://39.101.133.168:8807/qimaohong/ActivityProject into milestone-20250723-wwl

# Conflicts:
合并
#	lottery-system/lottery-common/src/main/java/com/lottery/result/Result.java

lottery-system/lottery-common/src/main/java/com/lottery/exception/SomeException.java

@@ -0,0 +1,21 @@
+package com.lottery.exception;
+
+/**
+ * @program: lottery-system
+ * @ClassName SomeException
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 15:07
+ * @Version 1.0
+ **/
+public class SomeException extends BaseException {
+
+
+    public SomeException(){
+
+    }
+
+    public SomeException(String massage){
+        super(massage);
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.lottery.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * @program: lottery-system
+ * @ClassName GradeDto
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 14:56
+ * @Version 1.0
+ **/
+@Data
+public class GradeDto {
+
+    private Long id;
+
+    private String GradeName; // 等级名称
+
+    private Integer amount; //等级数量
+
+    private Integer sort;
+
+    private Integer perWin;
+
+}

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

@@ -2,6 +2,7 @@ package com.lottery.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,6 +21,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("grade")
+@Builder
 public class Grade {
 
     @TableId(type = IdType.AUTO) // 主键自增策略
@@ -31,8 +33,8 @@ public class Grade {
 
     private int sort;
 
-    @TableField("pre_win")
-    private int preWin;
+    @TableField("per_win")
+    private int perWin;
 
     @TableField(value = "create_time", fill = FieldFill.INSERT) // 自动填充创建时间
     private Date createTime;

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

@@ -1,7 +1,11 @@
 package com.lottery.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @program: lottery-system
  * @ClassName GradeVo
@@ -13,7 +17,17 @@ import lombok.Data;
 @Data
 public class GradeVo {
 
-    private String name;
+    private Long id;
+
+    private String GradeName; // 等级名称
+
+    private int amount; //等级数量
+
+    private int sort;
+
+    private int perWin;
+
+    private Date createTime;
 
-    private int amount;
+    private Date updateTime;
 }

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

@@ -21,5 +21,6 @@ public class PrizeAndGradeVo {
 
     private int amount;
 
-    private int sort;
+    private int perWin;
+
 }

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

@@ -0,0 +1,104 @@
+package com.lottery.admin.controller;
+
+import com.lottery.admin.mapper.AdminGradeMapper;
+import com.lottery.admin.service.AdminGradeService;
+import com.lottery.dto.GradeDto;
+import com.lottery.entity.Grade;
+import com.lottery.exception.SomeException;
+import com.lottery.result.Result;
+import com.lottery.utils.ConvertBeanUtil;
+import com.lottery.vo.GradeVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: lottery-system
+ * @ClassName GradeController
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 14:44
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/admin/grade")
+public class AdminGradeController {
+
+    @Autowired
+    private AdminGradeService adminGradeService;
+
+    @Autowired
+    private AdminGradeMapper adminGradeMapper;
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(AdminGradeController.class);
+
+
+    @GetMapping("/list")
+    public Result<List<GradeVo>> selectGrade(){
+        LOGGER.info("查询所有等级");
+        return Result.success(ConvertBeanUtil.convertList(adminGradeService.list(), GradeVo.class));
+    }
+
+    @GetMapping("/details")
+    public Result<GradeVo> selectById(@RequestParam Long id){
+        LOGGER.info("根据id查找等级：{}",id);
+        return Result.success(ConvertBeanUtil.convert(adminGradeService.getById(id), GradeVo.class));
+    }
+
+
+    @PostMapping("/add")
+    public Result add(@RequestBody GradeDto gradeDto){
+
+        LOGGER.info("新增等级：{}", gradeDto);
+        if (gradeDto.getGradeName() == null || gradeDto.getAmount() == null||
+                gradeDto.getSort() == null || gradeDto.getPerWin() == null) {
+            return Result.failure("所有字段都必须填写");
+        }
+
+        Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class);
+
+        grade.setCreateTime(new Date());
+        grade.setUpdateTime(new Date());
+
+        if (!adminGradeService.save(grade))  return Result.failure("新增失败");
+
+        return Result.success();
+    }
+
+
+    @PutMapping("/update")
+    public Result update(@RequestBody GradeDto gradeDto){
+
+        if (gradeDto.getGradeName() == null || gradeDto.getAmount() == null||
+                gradeDto.getSort() == null || gradeDto.getPerWin() == null) {
+            return Result.failure("所有字段都必须填写");
+        }
+
+        LOGGER.info("修改等级：{}", gradeDto);
+        if (adminGradeService.getById(gradeDto.getId())== null) {
+            return Result.failure("修改的id不存在");
+        }
+
+        Grade grade = ConvertBeanUtil.convert(gradeDto, Grade.class);
+        grade.setUpdateTime(new Date());
+
+        if (!adminGradeService.updateById(grade))  return Result.failure("修改失败");
+        return Result.success();
+    }
+
+
+    @DeleteMapping("/delete")
+    public Result delete(@RequestParam Long id){
+        LOGGER.info("删除id为：{} 的等级" ,id);
+        if (!adminGradeService.removeById(id)){
+            return Result.failure("删除失败");
+        }
+        return Result.success();
+    }
+
+}

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

@@ -0,0 +1,18 @@
+package com.lottery.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lottery.entity.Grade;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @program: lottery-system
+ * @ClassName IGradeMapper
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 14:37
+ * @Version 1.0
+ **/
+
+@Mapper
+public interface AdminGradeMapper extends BaseMapper<Grade> {
+}

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

@@ -0,0 +1,21 @@
+package com.lottery.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lottery.dto.GradeDto;
+import com.lottery.entity.Grade;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: lottery-system
+ * @ClassName IGradeService
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 14:40
+ * @Version 1.0
+ **/
+
+
+public interface AdminGradeService extends IService<Grade> {
+
+//    boolean updateGrade(GradeDto gradeDto);
+}

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

@@ -0,0 +1,42 @@
+package com.lottery.admin.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lottery.admin.mapper.AdminGradeMapper;
+import com.lottery.admin.service.AdminGradeService;
+import com.lottery.dto.GradeDto;
+import com.lottery.entity.Grade;
+import com.lottery.exception.SomeException;
+import com.lottery.result.Result;
+import com.lottery.utils.ConvertBeanUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @program: lottery-system
+ * @ClassName GradeServiceImpl
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 14:42
+ * @Version 1.0
+ **/
+
+@Service
+public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade> implements AdminGradeService {
+
+//    @Autowired
+//    private AdminGradeMapper adminGradeMapper;
+
+
+//    @Override
+//    public boolean updateGrade(GradeDto gradeDto) {
+//
+//        Grade grade = ConvertBeanUtil.convert(gradeDto,Grade.class);
+//        grade.setUpdateTime(new Date());
+//        if (!(adminGradeMapper.updateById(grade) > 0)) {
+//            return false;
+//        }
+//        return true;
+ //   }
+}

lottery-system/lottery-service/src/main/java/com/lottery/api/controller/PrizeController.java

@@ -33,12 +33,13 @@ public class PrizeController {
     private final static Logger LOGGER = LoggerFactory.getLogger(PrizeController.class);
 
     @GetMapping("/list")
-    public Result<List<PrizeVo>> getAllPrize(){
+    public Result<List<PrizeAndGradeVo>> getAllPrizeAnd(){
 
         LOGGER.info("查询所有礼品和对应等级，按照sort值排序");
-        List<Prize> list = prizeService.list();
+//        List<Prize> list = prizeService.list();
 
-        List<PrizeAndGradeVo> l = prizeService.getAllPrizeAndGrade();
-        return Result.success(ConvertBeanUtil.convertList(list,PrizeVo.class));
+        List<PrizeAndGradeVo> list = prizeService.getAllPrizeAndGrade();
+
+        return Result.success(list);
     }
 }

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

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @create: 2025-07-12 17:36
  * @Version 1.0
  **/
+
 @Mapper
 public interface IGradeMapper extends BaseMapper<Grade> {
 }

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
  * @create: 2025-07-12 17:36
  * @Version 1.0
  **/
+
 @Service
 public class GradeServiceImpl extends ServiceImpl<IGradeMapper, Grade> implements IGradeService {
 }

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

@@ -36,8 +36,6 @@ public class PrizeServiceImpl extends ServiceImpl<IPrizeMapper, Prize> implement
     @Override
     public List<PrizeAndGradeVo> getAllPrizeAndGrade() {
 
-        PrizeAndGradeVo prizeAndGradeVo = new PrizeAndGradeVo();
-
         return prizeMapper.selectPrizeAndGrade();
     }
 }

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lottery.admin.mapper.AdminGradeMapper">
+
+</mapper>

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

@@ -3,7 +3,9 @@
 <mapper namespace="com.lottery.api.mapper.IPrizeMapper">
 
     <select id="selectPrizeAndGrade" resultType="com.lottery.vo.PrizeAndGradeVo">
-        select
-        from ;
+        select p.prize_name, p.image_url, g.grade_name, g.amount, g.per_win
+        from prize p
+        left join grade g on p.grade_id = g.id
+        order by g.sort desc
     </select>
 </mapper>