小修

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

@@ -24,7 +24,7 @@ public interface AdminGradeMapper extends BaseMapper<Grade> {
     @Select("select * from grade where grade_name = #{gradeName}")
     Grade selectByName(String gradeName);
 
-    @Select("select grade_name, id from grade where is_del = 0 order by sort desc ")
+    @Select("select grade_name, id from grade where is_del = 0 order by sort desc, id asc ")
     List<GradeSimpleVo> selectAllGrade();
 
     @Update("update grade set is_del = 1 where id = #{id}")

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

@@ -108,7 +108,7 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
 //            adminGradeMapper.updateById(grade);
 //        }
         if (!isPrizeSaved) {
-            return Result.failure("未知错误，添加失败,122行");
+            return Result.failure("未知错误，添加失败");
         }
         return Result.success();
     }

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

@@ -47,49 +47,7 @@ public class PrizeServiceImpl extends ServiceImpl<IPrizeMapper, Prize> implement
 
         List<PrizeAndGradeVo> prizeAndGradeVos = prizeMapper.selectPrizeAndGrade();
 
-//        for (PrizeAndGradeVo vo : prizeAndGradeVos) {
-//            String redisKey = REDIS_KEY_PREFIX + vo.getGradeId();
 //
-//            // 从Redis获取已抽取数量，如果没有则返回0
-//            Integer drawedCount = redisTemplate.opsForValue().get(redisKey);
-//            if (drawedCount == null) {
-//                drawedCount = 0;
-//            }
-//
-//            // 计算剩余数量 = 总数 - 已抽取数 - 每轮抽取数
-//            int remainNum = vo.getAmount() - drawedCount - vo.getPerWin();
-//            vo.setRemainNum(remainNum);
-//
-//            // 计算是否还有下一轮（剩余数量 >= 0）  也放在抽奖之后
-//            Integer isRound = 0;
-//            if ((vo.getAmount() - drawedCount) - vo.getPerWin() >= 0){
-//                isRound = 1;
-//            }
-//            vo.setIsRound(isRound);
-//
-//            // 计算当前轮次
-//            int currentRound = (drawedCount / vo.getPerWin()) + 1;
-//            vo.setCurrentRound(currentRound);
-//        }
-//        return prizeAndGradeVos;
-//    }
-//
-//
-//    @Transactional
-//    public List<PrizeAndGradeVo> drawWinners(Long gradeId, int winnerCount) {
-//        String redisKey = REDIS_KEY_PREFIX + gradeId;
-//
-//        // 原子性增加已抽取数量
-//        redisTemplate.opsForValue().increment(redisKey, winnerCount);
-//
-//        // 返回更新后的奖品信息
-//        return getAllPrizeAndGrade();
-//    }
-//
-//    public void resetDrawCount(Long gradeId) {
-//        String redisKey = REDIS_KEY_PREFIX + gradeId;
-//        redisTemplate.delete(redisKey);
-//    }
         return prizeAndGradeVos;
     }
 }

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

@@ -7,6 +7,6 @@
         from prize p
                  left join grade g on p.grade_id = g.id
         where p.is_del = 0
-        order by g.sort desc
+        order by g.sort desc, p.id asc
     </select>
 </mapper>