奖品bug修复

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

@@ -14,6 +14,7 @@ import com.lottery.result.Result;
 import com.lottery.utils.ConvertBeanUtil;
 import com.lottery.vo.PageInfo;
 import com.lottery.vo.PrizeVo;
+import org.apache.ibatis.annotations.Lang;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -124,10 +125,14 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
         Long gradeId = prizeDto.getGradeId();
         Grade grade = adminGradeMapper.selectById(gradeId);
 
-        Long l = adminPrizeMapper.selectByName(prizeDto.getPrizeName());
-        if (l != null) {
-            return Result.failure("奖品名已存在");
-        }
+        //LambdaUpdateWrapper<Prize> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        //lambdaUpdateWrapper.eq(Prize::getPrizeName, prizeDto.getPrizeName()).ne(Prize::getId, prizeDto.getId());
+        //this.update(null, lambdaUpdateWrapper);
+
+        //Long l = adminPrizeMapper.selectByName(prizeDto.getPrizeName());
+        //if (l != null){
+        //    return Result.failure("奖品名已存在");
+        //}
 
         // 2. 检查是否是修改现有奖品（需要传入prizeId）
         // 1. 查询原奖品信息
@@ -151,19 +156,18 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
         // 3. 如果修改后的等级和原等级不同，检查目标等级是否已有奖品
         if (!targetGrade.getId().equals(originalPrize.getGradeId())) {
             LambdaQueryWrapper<Prize> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(Prize::getGradeId, targetGrade.getId());
+            wrapper.eq(Prize::getGradeId, targetGrade.getId()).eq(Prize::getIs_del, 0);
             if (this.count(wrapper) > 0) {
                 return Result.failure("目标等级已有奖品，不能修改"); // 目标等级已有奖品，不能修改
             }
         }
-//
-//        // 4. 检查奖品名称是否重复（排除自己）
-//        LambdaQueryWrapper<Prize> nameCheckWrapper = new LambdaQueryWrapper<>();
-//        nameCheckWrapper.eq(Prize::getPrizeName, prizeDto.getPrizeName())
-//                .ne(Prize::getId, prizeDto.getId());
-//        if (this.count(nameCheckWrapper) > 0) {
-//            return false; // 奖品名称已存在
-//        }
+        // 4. 检查奖品名称是否重复（排除自己）
+        LambdaQueryWrapper<Prize> nameCheckWrapper = new LambdaQueryWrapper<>();
+        nameCheckWrapper.eq(Prize::getPrizeName, prizeDto.getPrizeName())
+                .ne(Prize::getId, prizeDto.getId());
+        if (this.count(nameCheckWrapper) > 0) {
+            return Result.failure("奖品名称已存在"); // 奖品名称已存在
+        }
 
 //        LambdaQueryWrapper<Prize> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(Prize::getGradeId, grade.getId());