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

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

@@ -137,11 +137,14 @@ public class AdminGradeServiceImpl extends ServiceImpl<AdminGradeMapper, Grade>
                 .set(Prize::getIs_del, 1);
         adminPrizeMapper.update(null, prizeWrapper);
 
-        // 4. 逻辑删除关联的 user_detail
+        // 4.硬删除关联的 user_detail
         LambdaUpdateWrapper<UserDetail> userDetailWrapper = new LambdaUpdateWrapper<>();
-        userDetailWrapper.eq(UserDetail::getGradeId, id)
-                .set(UserDetail::getIsDel, 1);
-        adminUserDetailMapper.update(null, userDetailWrapper);
+//        userDetailWrapper.eq(UserDetail::getGradeId, id)
+//                .set(UserDetail::getIsDel, 1);
+//        adminUserDetailMapper.update(null, userDetailWrapper);
+        userDetailWrapper.eq(UserDetail::getGradeId, id);
+        adminUserDetailMapper.delete(userDetailWrapper);
+
 
         // 5. 逻辑删除 grade
         adminGradeMapper.deleteGradeById(id);

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

@@ -315,6 +315,7 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
     }
 
     @Override
+    @Transactional
     public boolean removePrizeById(Long id) {
 
         //把关联的win_record表删了，
@@ -324,8 +325,11 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
 
         //把关联的user_detail表删了
         LambdaUpdateWrapper<UserDetail> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(UserDetail::getUserId, id).set(UserDetail::getIsDel, 1);
-        adminUserDetailMapper.update(null, wrapper);
+//        wrapper.eq(UserDetail::getUserId, id).set(UserDetail::getIsDel, 1);
+//        adminUserDetailMapper.update(null, wrapper);
+        Prize prize = adminPrizeMapper.selectById(id);
+        wrapper.eq(UserDetail::getGradeId, prize.getGradeId());
+        adminUserDetailMapper.delete(wrapper);
 
         //最后逻辑删除奖品
         return adminPrizeMapper.deletePrizeById(id);

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

@@ -260,6 +260,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
     }
 
     @Override
+    @Transactional
     public void removeUserById(Long id) {
         //关联硬删删除user_detail
         //LambdaUpdateWrapper<UserDetail> updateWrapper = new LambdaUpdateWrapper<>();