novalon/gym-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增e2e测试脚本，修复部分问题

Browse Source
This commit was merged in pull request #51.
This commit is contained in:
liwentao
2026-07-22 20:00:13 +08:00
parent 53d1ce6fb2
commit 4c07ec5455
105 changed files with 21700 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gym-manage-api/gym-checkIn/src/main/java/cn/novalon/gym/manage/checkIn/service/impl/CheckServiceImpl.java
+28 -12
View File
@@ -15,6 +15,8 @@ import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
import cn.novalon.gym.manage.common.util.RedisUtil;
import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
import cn.novalon.gym.manage.member.entity.MemberCard;
import cn.novalon.gym.manage.member.entity.MemberCardRecord;
@@ -47,6 +49,7 @@ public class CheckServiceImpl implements ICheckInService {
private final MemberCardRepository memberCardRepository;
private final SignInRecordRepository signInRecordRepository;
private final IGroupCourseBookingService groupCourseBookingService;
private final IGroupCourseBookingRepository groupCourseBookingRepository;
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -140,14 +143,28 @@ public class CheckServiceImpl implements ICheckInService {
// 发送实时进度通知
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "正在检查预约信息...");
// 检查是否有需要签到的团课预约
// 检查是否有需要签到的团课预约，有则返回有效预约
return validateBooking(memberId, now)
.flatMap(booking ->
// 有有效预约：将预约状态更新为"已出席"
groupCourseBookingRepository.updateStatus(booking.getId(), "2")
.doOnNext(count -> log.info("已更新预约状态为已出席, bookingId: {}, rows: {}", booking.getId(), count))
.then(Mono.just(true))
)
.defaultIfEmpty(false)
.then(Mono.defer(() -> {
redisMap.put("isUsed", true);
redisMap.put("checkInTime", now.format(DATE_FORMATTER));
return saveSignInRecord(memberId, null, null)
.then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
// 清除统计缓存和课程缓存，确保管理端/教练端立即反映最新数据
.then(Mono.defer(() ->
redisUtil.deleteByPattern("datacount:statistics:*")
.then(Mono.defer(() -> redisUtil.deleteByPattern("group_course:*")))
.doOnSuccess(v -> log.info("已清除统计缓存和课程缓存, memberId: {}", memberId))
.then()
))
.then(Mono.defer(() -> {
String successMsg = buildSuccessResponse(now);
MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
@@ -158,9 +175,9 @@ public class CheckServiceImpl implements ICheckInService {
}
/**
* 验证预约信息
* 验证预约信息，返回时间匹配的有效预约
*/
private Mono<Void> validateBooking(Long memberId, LocalDateTime now) {
private Mono<GroupCourseBooking> validateBooking(Long memberId, LocalDateTime now) {
return groupCourseBookingService.getBookingsByMemberId(memberId)
.filter(booking -> {
String status = booking.getStatus();
@@ -175,19 +192,18 @@ public class CheckServiceImpl implements ICheckInService {
if (bookings.isEmpty()) {
return Mono.empty();
}
boolean hasValidBooking = bookings.stream()
.anyMatch(b -> {
// 找到时间范围内第一个有效预约（课程时间内±30分钟）
return Flux.fromIterable(bookings)
.filter(b -> {
LocalDateTime startTime = b.getCourseStartTime();
return startTime != null &&
!startTime.isBefore(now.minusMinutes(30)) &&
!startTime.isAfter(now.plusMinutes(30));
});
if (hasValidBooking) {
log.info("会员{}有有效的团课预约", memberId);
} else {
log.warn("会员{}有预约但不在签到时间范围内", memberId);
}
return Mono.empty();
})
.next()
.doOnNext(b -> log.info("会员{}有有效的团课预约, bookingId: {}", memberId, b.getId()))
.switchIfEmpty(Mono.fromRunnable(() ->
log.warn("会员{}有预约但不在签到时间范围内", memberId)));
});
}
gym-manage-api/gym-checkIn/src/test/java/cn/novalon/gym/manage/checkin/CheckInModuleTest.java
+7 -1
View File
@@ -3,6 +3,7 @@ package cn.novalon.gym.manage.checkin;
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository;
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
@@ -57,6 +58,9 @@ class CheckInModuleTest {
@Mock
private IGroupCourseBookingService groupCourseBookingService;
@Mock
private IGroupCourseBookingRepository groupCourseBookingRepository;
@Mock
private MemberCard mockMemberCard;
@@ -72,7 +76,8 @@ class CheckInModuleTest {
void setUp() {
MockitoAnnotations.openMocks(this);
checkService = new CheckServiceImpl(qrCodeConfig, redisUtil, memberCardRecordRepository,
memberCardRepository, signInRecordRepository, groupCourseBookingService);
memberCardRepository, signInRecordRepository, groupCourseBookingService,
groupCourseBookingRepository);
when(mockMemberCard.getId()).thenReturn(1L);
when(mockMemberCard.getMemberCardType()).thenReturn("TIME_CARD");
@@ -126,6 +131,7 @@ class CheckInModuleTest {
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
when(redisUtil.deleteByPattern(any(String.class))).thenReturn(Mono.empty());
when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));