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

修复多处问题

Browse Source
This commit was merged in pull request #46.
This commit is contained in:
liwentao
2026-06-29 02:56:13 +08:00
parent 80759f6793
commit efd4d03037
14 changed files with 386 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java
+6
View File
@@ -61,6 +61,12 @@ public interface GroupCourseBookingDao extends R2dbcRepository<GroupCourseBookin
*/
Mono<Long> countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status);
/**
* 统计会员取消的预约次数
*/
@org.springframework.data.r2dbc.repository.Query("SELECT COUNT(*) FROM group_course_booking WHERE member_id = :memberId AND status = '1' AND deleted_at IS NULL")
Mono<Long> countCancelledByMemberId(Long memberId);
/**
* 查询会员是否有时间冲突的预约（状态为已预约且未取消）
* 时间冲突条件：新课程的开始时间 < 已预约课程的结束时间 且 新课程的结束时间 > 已预约课程的开始时间
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java
+64 -67
View File
@@ -9,11 +9,13 @@ import cn.novalon.gym.manage.member.entity.MemberCardRecord;
import cn.novalon.gym.manage.member.enums.MemberCardType;
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
import cn.novalon.gym.manage.member.service.IMemberCardRecordService;
import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -34,6 +36,7 @@ public class BookingSagaHandler {
private final IGroupCourseBookingRepository bookingRepository;
private final IGroupCourseRepository courseRepository;
private final IMemberCardRecordService memberCardRecordService;
private final IMemberStoredCardService memberStoredCardService;
private final MemberCardRepository memberCardRepository;
private final GroupCourseRedisService redisService;
@@ -44,10 +47,10 @@ public class BookingSagaHandler {
*
* 步骤：
* 1. 保存预约记录
* 2. 扣减会员卡权益
* 2. 扣减储值卡余额（储值卡类型）
* 3. 更新课程当前人数
*/
public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId) {
public Mono<GroupCourseBooking> executeBooking(GroupCourseBooking booking, Long recordId, BigDecimal storedValueAmount) {
List<SagaStep> steps = new ArrayList<>();
List<SagaStep> rollbackSteps = new ArrayList<>();
@@ -60,11 +63,11 @@ public class BookingSagaHandler {
steps.add(step1);
rollbackSteps.add(0, step1);
// 步骤2：扣减会员卡权益（根据卡类型决定扣除次数还是金额）
// 步骤2：扣减权益（根据卡类型）
SagaStep step2 = new SagaStep(
"扣减会员卡权益",
deductCardUsageByCardType(booking.getMemberId(), recordId),
Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId))
"扣减权益",
deductCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount),
Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId, storedValueAmount))
);
steps.add(step2);
rollbackSteps.add(0, step2);
@@ -94,7 +97,7 @@ public class BookingSagaHandler {
/**
* 根据会员卡类型扣减权益
*/
private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId) {
private Mono<Void> deductCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
return memberCardRecordService.findById(recordId)
.switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
.flatMap(record -> {
@@ -109,14 +112,13 @@ public class BookingSagaHandler {
switch (cardType) {
case COUNT_CARD:
// 次数卡不再支持团课预约
return Mono.error(new RuntimeException("团课预约仅支持储值卡支付"));
return Mono.error(new RuntimeException("团课预约仅支持储值卡和时长卡支付"));
case STORED_VALUE_CARD:
// 储值卡扣除金额
return deductCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
return deductStoredCardBalance(memberId, storedValueAmount);
case TIME_CARD:
// 时长卡不扣除，但需验证有效期
return validateTimeCard(record);
// 时长卡验证有效期后，仍须从储值卡扣款
return validateTimeCard(record)
.then(deductStoredCardBalance(memberId, storedValueAmount));
default:
return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
}
@@ -153,11 +155,10 @@ public class BookingSagaHandler {
/**
* 根据会员卡类型恢复权益
*/
private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId) {
private Mono<Void> restoreCardUsageByCardType(Long memberId, Long recordId, BigDecimal storedValueAmount) {
return memberCardRecordService.findById(recordId)
.switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
.flatMap(record -> {
// 验证会员卡归属（memberId为null时跳过验证）
if (memberId != null && !record.getMemberId().equals(memberId)) {
return Mono.error(new RuntimeException("会员卡不归属当前用户"));
}
@@ -168,12 +169,29 @@ public class BookingSagaHandler {
switch (cardType) {
case COUNT_CARD:
// 次数卡不再支持团课预约，无需恢复
return Mono.empty();
case STORED_VALUE_CARD:
return restoreCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE);
// 返还储值卡余额（回滚时全额返还）
BigDecimal amount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
return memberStoredCardService.recharge(memberId, amount)
.flatMap(rows -> {
if (rows > 0) {
log.info("储值卡回滚返还成功: memberId={}, amount={}", memberId, amount);
return Mono.empty();
}
return Mono.empty();
});
case TIME_CARD:
return Mono.empty();
// 时长卡回滚时也返还储值卡
BigDecimal timeAmount = storedValueAmount != null ? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
return memberStoredCardService.recharge(memberId, timeAmount)
.flatMap(rows -> {
if (rows > 0) {
log.info("储值卡回滚返还成功(时长卡): memberId={}, amount={}", memberId, timeAmount);
return Mono.empty();
}
return Mono.empty();
});
default:
return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType));
}
@@ -184,7 +202,7 @@ public class BookingSagaHandler {
/**
* 执行取消预约事务
*/
public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId) {
public Mono<GroupCourseBooking> executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId, BigDecimal storedValueAmount, long cancelCount) {
List<SagaStep> steps = new ArrayList<>();
List<SagaStep> rollbackSteps = new ArrayList<>();
@@ -197,11 +215,12 @@ public class BookingSagaHandler {
steps.add(step1);
rollbackSteps.add(0, step1);
// 步骤2：恢复会员卡权益
// 步骤2：返还储值卡余额（含手续费逻辑）
SagaStep step2 = new SagaStep(
"恢复会员卡权益",
restoreCardUsageByCardType(memberId, recordId),
Mono.defer(() -> deductCardUsageByCardType(memberId, recordId))
"返还储值卡余额",
refundStoredCardWithFee(memberId, storedValueAmount, cancelCount),
// 回滚时重新扣减
Mono.defer(() -> deductCardUsageByCardType(memberId, recordId, storedValueAmount))
);
steps.add(step2);
rollbackSteps.add(0, step2);
@@ -253,54 +272,32 @@ public class BookingSagaHandler {
return bookingRepository.deleteById(bookingId);
}
private Mono<Void> deductCardUsage(Long recordId, Integer deductTimes, Double deductAmount) {
if (deductTimes == 0 && deductAmount == 0.0) {
return Mono.empty();
}
return memberCardRecordService.findById(recordId)
.switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在")))
.flatMap(record -> {
cn.novalon.gym.manage.member.enums.MemberCardRecordStatus status = record.getStatus();
if (status != cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE) {
return Mono.error(new RuntimeException("会员卡状态无效，当前状态: " + (status != null ? status.getDesc() : "未知")));
/**
* 从储值卡扣减余额
*/
private Mono<Void> deductStoredCardBalance(Long memberId, BigDecimal storedValueAmount) {
BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
return memberStoredCardService.consume(memberId, amount)
.flatMap(rows -> {
if (rows == 0) {
return Mono.error(new RuntimeException("储值卡扣减失败，余额不足"));
}
java.time.LocalDateTime expireTime = record.getExpireTime();
if (expireTime != null && expireTime.isBefore(java.time.LocalDateTime.now())) {
return Mono.error(new RuntimeException("会员卡已过期"));
}
if (record.getRemainingTimes() != null && deductTimes > 0 && record.getRemainingTimes() < deductTimes) {
return Mono.error(new RuntimeException("会员卡剩余次数不足，当前剩余: " + record.getRemainingTimes() + "次"));
}
if (record.getRemainingAmount() != null && deductAmount > 0 && record.getRemainingAmount() < deductAmount) {
return Mono.error(new RuntimeException("会员卡余额不足，当前剩余: " + record.getRemainingAmount()));
}
return memberCardRecordService.deductUsage(recordId, deductTimes, deductAmount)
.flatMap(rows -> {
if (rows == 0) {
return Mono.error(new RuntimeException("扣减会员卡权益失败，请重试"));
}
return Mono.empty();
});
log.info("储值卡扣减成功: memberId={}, amount={}", memberId, amount);
return Mono.empty();
});
}
private Mono<Void> restoreCardUsage(Long recordId, Integer addTimes, Double addAmount) {
if (addTimes == 0 && addAmount == 0.0) {
return Mono.empty();
}
return memberCardRecordService.findById(recordId)
.switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益")))
.flatMap(record -> {
// 使用当前记录的过期时间，避免清空过期时间
return memberCardRecordService.renewCard(recordId, addTimes, addAmount, record.getExpireTime())
.flatMap(rows -> {
if (rows == 0) {
return Mono.error(new RuntimeException("恢复会员卡权益失败，请重试"));
}
return Mono.empty();
});
/**
* 返还储值卡余额（含手续费逻辑，仅用于取消预约）
*/
private Mono<Void> refundStoredCardWithFee(Long memberId, BigDecimal storedValueAmount, long cancelCount) {
BigDecimal amount = storedValueAmount != null && storedValueAmount.compareTo(BigDecimal.ZERO) > 0
? storedValueAmount : BigDecimal.valueOf(DEFAULT_GROUP_COURSE_PRICE);
return memberStoredCardService.refundBalanceWithFee(memberId, amount, cancelCount)
.flatMap(refundedAmount -> {
log.info("储值卡退款成功(含手续费): memberId={}, cancelCount={}, 退款金额={}", memberId, cancelCount, refundedAmount);
return Mono.empty();
});
}
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java
+70 -31
View File
@@ -2,6 +2,7 @@ package cn.novalon.gym.manage.groupcourse.handler;
import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking;
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
import cn.novalon.gym.manage.member.service.IMemberStoredCardService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.stereotype.Component;
@@ -23,9 +24,12 @@ import java.util.Map;
public class GroupCourseBookingHandler {
private final IGroupCourseBookingService bookingService;
private final IMemberStoredCardService memberStoredCardService;
public GroupCourseBookingHandler(IGroupCourseBookingService bookingService) {
public GroupCourseBookingHandler(IGroupCourseBookingService bookingService,
IMemberStoredCardService memberStoredCardService) {
this.bookingService = bookingService;
this.memberStoredCardService = memberStoredCardService;
}
/**
@@ -45,24 +49,35 @@ public class GroupCourseBookingHandler {
if (body.get("memberCardRecordId") == null) {
return buildErrorResponse("请提供会员卡记录ID");
}
if (body.get("payPassword") == null || body.get("payPassword").toString().isEmpty()) {
return buildErrorResponse("请输入支付密码");
}
Long courseId = ((Number) body.get("courseId")).longValue();
Long memberId = ((Number) body.get("memberId")).longValue();
Long memberCardRecordId = ((Number) body.get("memberCardRecordId")).longValue();
Long courseId = toLong(body.get("courseId"), "courseId");
Long memberId = toLong(body.get("memberId"), "memberId");
Long memberCardRecordId = toLong(body.get("memberCardRecordId"), "memberCardRecordId");
String payPassword = body.get("payPassword").toString();
return bookingService.bookCourse(courseId, memberId, memberCardRecordId)
.flatMap(booking -> {
Map<String, Object> response = new HashMap<>();
response.put("success", true);
response.put("message", "预约成功");
response.put("data", booking);
return ServerResponse.ok().bodyValue(response);
})
.onErrorResume(error -> {
Map<String, Object> response = new HashMap<>();
response.put("success", false);
response.put("message", error.getMessage());
return ServerResponse.badRequest().bodyValue(response);
// 验证支付密码
return memberStoredCardService.verifyPayPassword(memberId, payPassword)
.flatMap(passwordValid -> {
if (!passwordValid) {
return buildErrorResponse("支付密码错误");
}
return bookingService.bookCourse(courseId, memberId, memberCardRecordId)
.flatMap(booking -> {
Map<String, Object> response = new HashMap<>();
response.put("success", true);
response.put("message", "预约成功");
response.put("data", booking);
return ServerResponse.ok().bodyValue(response);
})
.onErrorResume(error -> {
Map<String, Object> response = new HashMap<>();
response.put("success", false);
response.put("message", error.getMessage());
return ServerResponse.badRequest().bodyValue(response);
});
});
});
}
@@ -76,21 +91,32 @@ public class GroupCourseBookingHandler {
return request.bodyToMono(Map.class)
.flatMap(body -> {
Long memberId = ((Number) body.get("memberId")).longValue();
Long memberId = toLong(body.get("memberId"), "memberId");
if (body.get("payPassword") == null || body.get("payPassword").toString().isEmpty()) {
return buildErrorResponse("请输入支付密码");
}
String payPassword = body.get("payPassword").toString();
return bookingService.cancelBooking(bookingId, memberId)
.flatMap(booking -> {
Map<String, Object> response = new HashMap<>();
response.put("success", true);
response.put("message", "取消成功");
response.put("data", booking);
return ServerResponse.ok().bodyValue(response);
})
.onErrorResume(error -> {
Map<String, Object> response = new HashMap<>();
response.put("success", false);
response.put("message", error.getMessage());
return ServerResponse.badRequest().bodyValue(response);
// 验证支付密码
return memberStoredCardService.verifyPayPassword(memberId, payPassword)
.flatMap(passwordValid -> {
if (!passwordValid) {
return buildErrorResponse("支付密码错误");
}
return bookingService.cancelBooking(bookingId, memberId)
.flatMap(booking -> {
Map<String, Object> response = new HashMap<>();
response.put("success", true);
response.put("message", "取消成功");
response.put("data", booking);
return ServerResponse.ok().bodyValue(response);
})
.onErrorResume(error -> {
Map<String, Object> response = new HashMap<>();
response.put("success", false);
response.put("message", error.getMessage());
return ServerResponse.badRequest().bodyValue(response);
});
});
});
}
@@ -129,6 +155,19 @@ public class GroupCourseBookingHandler {
.body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class);
}
/**
* 安全转换为 Long，支持 Number 和 String 类型
*/
private Long toLong(Object value, String fieldName) {
if (value instanceof Number) {
return ((Number) value).longValue();
}
if (value instanceof String) {
return Long.valueOf((String) value);
}
throw new IllegalArgumentException("参数 " + fieldName + " 类型不正确");
}
/**
* 构建错误响应
*/
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java
+7
View File
@@ -89,4 +89,11 @@ public interface IGroupCourseBookingRepository {
* @return 更新记录数
*/
Mono<Integer> updateToAbsent(Long bookingId);
/**
* 统计会员取消的预约次数
* @param memberId 会员ID
* @return 取消次数
*/
Mono<Long> countCancelledByMemberId(Long memberId);
}
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java
+5
View File
@@ -112,4 +112,9 @@ public class GroupCourseBookingRepository implements IGroupCourseBookingReposito
java.time.LocalDateTime now = java.time.LocalDateTime.now();
return groupCourseBookingDao.updateToAbsent(bookingId, now);
}
@Override
public Mono<Long> countCancelledByMemberId(Long memberId) {
return groupCourseBookingDao.countCancelledByMemberId(memberId);
}
}
gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java
+12 -3
View File
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.UUID;
@@ -157,7 +158,8 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
booking.setLocation(course.getLocation());
// 10. 使用Saga事务执行预约（包含权益扣减）
return bookingSagaHandler.executeBooking(booking, memberCardRecordId)
BigDecimal courseAmount = course.getStoredValueAmount() != null ? course.getStoredValueAmount() : BigDecimal.ZERO;
return bookingSagaHandler.executeBooking(booking, memberCardRecordId, courseAmount)
.flatMap(savedBooking -> {
// 11. 释放锁
return redisService.releaseLock(courseId, requestId)
@@ -290,8 +292,15 @@ public class GroupCourseBookingService implements IGroupCourseBookingService {
"需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消");
}
// 5. 使用Saga事务执行取消预约（包含权益恢复）
return bookingSagaHandler.executeCancelBooking(bookingId, booking.getCourseId(), booking.getMemberCardRecordId(), memberId)
// 5. 查询课程金额和已取消次数，使用Saga事务执行取消预约
return courseRepository.findByIdAndDeletedAtIsNull(booking.getCourseId())
.flatMap(course -> {
BigDecimal courseAmount = course.getStoredValueAmount() != null ? course.getStoredValueAmount() : BigDecimal.valueOf(50);
return bookingRepository.countCancelledByMemberId(memberId)
.flatMap(cancelCount -> {
return bookingSagaHandler.executeCancelBooking(bookingId, booking.getCourseId(), booking.getMemberCardRecordId(), memberId, courseAmount, cancelCount);
});
})
.flatMap(updatedBooking -> {
// 6. 释放锁
return redisService.releaseLock(bookingId, requestId)