hahah

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

@@ -25,8 +25,7 @@ public class Grade {
     @TableId(type = IdType.AUTO) // 主键自增策略
     private Long id;
 
-    @TableField("name")
-    private String name; // 等级名称
+    private String GradeName; // 等级名称
 
     private int amount; //等级数量
 

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

@@ -27,7 +27,7 @@ public class Prize {
     private Long id;
 
     // 名称
-    private String name;
+    private String PrizeName;
 
     private Long gradeId;
 

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

@@ -0,0 +1,25 @@
+package com.lottery.vo;
+
+import lombok.Data;
+
+/**
+ * @program: lottery-system
+ * @ClassName PrizeAndGradeVo
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-14 13:34
+ * @Version 1.0
+ **/
+@Data
+public class PrizeAndGradeVo {
+
+    private String prizeName;
+
+    private String imageUrl;
+
+    private String GradeName;
+
+    private int amount;
+
+    private int sort;
+}

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

@@ -4,6 +4,7 @@ import com.lottery.entity.Prize;
 import com.lottery.result.Result;
 import com.lottery.api.service.IPrizeService;
 import com.lottery.utils.ConvertBeanUtil;
+import com.lottery.vo.PrizeAndGradeVo;
 import com.lottery.vo.PrizeVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,8 +35,10 @@ public class PrizeController {
     @GetMapping("/list")
     public Result<List<PrizeVo>> getAllPrize(){
 
-        LOGGER.info("查询所有礼品");
+        LOGGER.info("查询所有礼品和对应等级，按照sort值排序");
         List<Prize> list = prizeService.list();
+
+        List<PrizeAndGradeVo> l = prizeService.getAllPrizeAndGrade();
         return Result.success(ConvertBeanUtil.convertList(list,PrizeVo.class));
     }
 }

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

@@ -2,9 +2,12 @@ package com.lottery.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lottery.entity.Prize;
+import com.lottery.vo.PrizeAndGradeVo;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @program: lottery-system
  * @ClassName IPrizeMapper
@@ -17,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IPrizeMapper extends BaseMapper<Prize> {
 
+    List<PrizeAndGradeVo> selectPrizeAndGrade();
 }

lottery-system/lottery-service/src/main/java/com/lottery/api/service/IPrizeService.java

@@ -2,6 +2,9 @@ package com.lottery.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lottery.entity.Prize;
+import com.lottery.vo.PrizeAndGradeVo;
+
+import java.util.List;
 
 /**
  * @program: lottery-system
@@ -15,4 +18,5 @@ import com.lottery.entity.Prize;
 public interface IPrizeService extends IService<Prize> {
 
 
+     List<PrizeAndGradeVo> getAllPrizeAndGrade();
 }

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

@@ -1,14 +1,18 @@
 package com.lottery.api.service.Impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lottery.api.mapper.IGradeMapper;
 import com.lottery.api.mapper.IPrizeMapper;
+import com.lottery.api.service.IGradeService;
 import com.lottery.api.service.IPrizeService;
 import com.lottery.entity.Prize;
+import com.lottery.vo.PrizeAndGradeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @program: lottery-system
@@ -22,5 +26,18 @@ import java.util.Date;
 @Service
 public class PrizeServiceImpl extends ServiceImpl<IPrizeMapper, Prize> implements IPrizeService {
 
+    @Autowired
+    private IPrizeMapper prizeMapper;
 
+    @Autowired
+    private IGradeMapper gradeMapper;
+
+
+    @Override
+    public List<PrizeAndGradeVo> getAllPrizeAndGrade() {
+
+        PrizeAndGradeVo prizeAndGradeVo = new PrizeAndGradeVo();
+
+        return prizeMapper.selectPrizeAndGrade();
+    }
 }

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

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lottery.api.mapper.IPrizeMapper">
 
+    <select id="selectPrizeAndGrade" resultType="com.lottery.vo.PrizeAndGradeVo">
+        select
+        from ;
+    </select>
 </mapper>