修bug

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

@@ -6,16 +6,10 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWra
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lottery.LotteryApplication;
-import com.lottery.admin.mapper.AdminGradeMapper;
-import com.lottery.admin.mapper.AdminPrizeMapper;
-import com.lottery.admin.mapper.AdminUserDetailMapper;
-import com.lottery.admin.mapper.AdminWinMapper;
+import com.lottery.admin.mapper.*;
 import com.lottery.admin.service.AdminGradeService;
 import com.lottery.dto.GradeDto;
-import com.lottery.entity.Grade;
-import com.lottery.entity.Prize;
-import com.lottery.entity.UserDetail;
-import com.lottery.entity.WinnerRecord;
+import com.lottery.entity.*;
 import com.lottery.exception.SomeException;
 import com.lottery.result.Result;
 import com.lottery.utils.ConvertBeanUtil;
@@ -56,6 +50,8 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
 
     @Autowired
     private AdminWinMapper adminWinMapper;
+    @Autowired
+    private AdminUserMapper adminUserMapper;
 
     public AdminGradeServiceImpl(AdminGradeMapper adminGradeMapper) {
         this.adminGradeMapper = adminGradeMapper;
@@ -119,18 +115,32 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
                         .select(Prize::getId)
         );
 
-        // 2. 批量逻辑删除关联的 win_record
         if (!prizes.isEmpty()) {
             List<Long> prizeIds = prizes.stream()
                     .map(Prize::getId)
                     .collect(Collectors.toList());
 
+
+            //修改user的isWin
+            LambdaQueryWrapper<WinnerRecord> queryWrapper = new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<WinnerRecord> in = queryWrapper.in(WinnerRecord::getPrizeId, prizeIds);
+            List<WinnerRecord> winnerRecords = adminWinMapper.selectList(in);
+            List<Long> userIds = winnerRecords.stream().map(WinnerRecord::getUserId).collect(Collectors.toList());
+
+            LambdaUpdateWrapper<User> userLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            userLambdaUpdateWrapper.in(User::getId, userIds).set(User::getIsWin, 0);
+
+            adminUserMapper.update(null, userLambdaUpdateWrapper);
+
+
+            // 2. 批量逻辑删除关联的 win_record
             LambdaUpdateWrapper<WinnerRecord> winRecordWrapper = new LambdaUpdateWrapper<>();
             winRecordWrapper.in(WinnerRecord::getPrizeId, prizeIds)
                     .set(WinnerRecord::getIsDel, 1);
             adminWinMapper.update(null, winRecordWrapper);
         }
 
+
         // 3. 逻辑删除关联的 prize
         LambdaUpdateWrapper<Prize> prizeWrapper = new LambdaUpdateWrapper<>();
         prizeWrapper.eq(Prize::getGradeId, id)
@@ -145,7 +155,6 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
         userDetailWrapper.eq(UserDetail::getGradeId, id);
         adminUserDetailMapper.delete(userDetailWrapper);
 
-
         // 5. 逻辑删除 grade
         adminGradeMapper.deleteGradeById(id);
         return true;

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

@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @program: lottery
@@ -266,6 +267,11 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
             // 1. 检查用户是否存在，不存在则创建
             Long userId = adminUserMapper.selectByJwcode(fixUserDto.getJwcode());
             String s = fundingMapper.updateLocMarketToCn(locMarket);
+            if (adminUserMapper.selectById(userId) != null && adminUserMapper.selectById(userId).getIsDel() == 1) {
+                LambdaUpdateWrapper<User> userLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                userLambdaUpdateWrapper.eq(User::getId, userId).set(User::getIsDel, 0);
+                adminUserMapper.update(null, userLambdaUpdateWrapper);
+            }
             if (userId == null) {
                 User user = User.builder()
                         .username(fixUserDto.getUsername())
@@ -281,6 +287,8 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
                 userId = user.getId();
             }
 
+
+
             Long gradeId = fixUserDto.getGradeId();
 
             // 2. 检查该等级下是否已存在未删除的内定用户
@@ -354,6 +362,19 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
         updateWrapper.eq(WinnerRecord::getPrizeId, id).set(WinnerRecord::getIsDel, 1);
         adminWinMapper.update(null, updateWrapper);
 
+        //更新user的isWIn
+        //修改user的isWin
+        LambdaQueryWrapper<WinnerRecord> queryWrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<WinnerRecord> eq = queryWrapper.eq(WinnerRecord::getPrizeId, id);
+        List<WinnerRecord> winnerRecords = adminWinMapper.selectList(eq);
+        List<Long> userIds = winnerRecords.stream().map(WinnerRecord::getUserId).collect(Collectors.toList());
+
+        LambdaUpdateWrapper<User> userLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        userLambdaUpdateWrapper.in(User::getId, userIds).set(User::getIsWin, 0);
+
+        adminUserMapper.update(null, userLambdaUpdateWrapper);
+
+
         //把关联的user_detail表删了
         LambdaUpdateWrapper<UserDetail> wrapper = new LambdaUpdateWrapper<>();
 //        wrapper.eq(UserDetail::getUserId, id).set(UserDetail::getIsDel, 1);

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

@@ -155,10 +155,10 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
 
         String locMarket  = rootNode.path("data").path("loc_market").asText();
 
-        User user1 = adminUserMapper.selectByName(userDto.getUsername());
-        if (user1 != null) {
-            return false;
-        }
+//        User user1 = adminUserMapper.selectByName(userDto.getUsername());
+//        if (user1 != null) {
+//            return false;
+//        }
 
         // 1. 查询是否已存在相同精网号的用户
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();

lottery-system/lottery-service/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   # 基础配置 (所有环境通用)
   profiles:
-    active: prod
+    active: dev
 
   # Jackson 基础配置
   jackson: