wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix Bug #574: fallback修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 03:16:06 +08:00
parent 227ada4c1d
commit 494de72723
1 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/main/java/com/openhis/application/service/impl/AppointmentServiceImpl.java
View File

@@ -48,58 +48,69 @@ public class AppointmentServiceImpl implements AppointmentService {
* *
* @param orderId 预约订单主键 * @param orderId 预约订单主键
* @param slotId 对应的排班号槽主键 * @param slotId 对应的排班号槽主键
* @param payInfo 支付信息（如金额、支付方式等），此处简化为字符串
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void payAndCheckIn(Long orderId, Long slotId, String payInfo) { public void payAndCheckIn(Long orderId, Long slotId) {
// 1. 校验订单是否存在且状态允许支付 // 1. 校验订单是否存在且状态为“待支付”(0)
var order = orderMainMapper.selectById(orderId); OrderMain order = orderMainMapper.selectById(orderId);
if (order == null) { if (order == null) {
throw new BusinessException("预约订单不存在"); throw new BusinessException("预约订单不存在");
} }
if (order.getStatus() != 0) { // 0：待支付 if (order.getStatus() != 0) {
throw new BusinessException("订单状态不允许支付"); throw new BusinessException("订单状态不允许支付或签到");
} }
// 2. 执行支付逻辑（此处仅示例，实际应调用支付平台） // 2. 更新订单状态为“已支付”(1) 并记录支付时间
// 假设支付成功后，需要更新订单状态为 “已支付”(1) OrderMain updatedOrder = new OrderMain();
order.setStatus(1); updatedOrder.setId(orderId);
orderMainMapper.updateById(order); updatedOrder.setStatus(1); // 已支付
updatedOrder.setPayTime(java.time.LocalDateTime.now());
int orderUpdateCnt = orderMainMapper.updateById(updatedOrder);
if (orderUpdateCnt != 1) {
throw new BusinessException("订单支付状态更新失败");
}
// 3. 更新号槽状态为已取号 // 3. 将对应的号槽状态从“已预约”(2) 更新为“已取号”(3)
admScheduleSlotMapper.updateStatus(slotId, 3); LambdaUpdateWrapper<AdmScheduleSlot> slotUpdate = new LambdaUpdateWrapper<>();
slotUpdate.eq(AdmScheduleSlot::getId, slotId)
.eq(AdmScheduleSlot::getStatus, 2) // 只在已预约状态下更新
.set(AdmScheduleSlot::getStatus, 3) // 已取号
.set(AdmScheduleSlot::getCheckInTime, java.time.LocalDateTime.now());
int slotUpdateCnt = admScheduleSlotMapper.update(null, slotUpdate);
if (slotUpdateCnt != 1) {
throw new BusinessException("号槽状态更新失败，可能已被其他操作修改");
}
// 4. 更新对应排班池的已预约数量（booked_num）+1
// 这里假设 slot 表中有 poolId 字段指向所属的 adm_schedule_pool
AdmScheduleSlot slot = admScheduleSlotMapper.selectById(slotId);
if (slot == null) {
throw new BusinessException("号槽信息获取失败");
}
LambdaUpdateWrapper<AdmSchedulePool> poolUpdate = new LambdaUpdateWrapper<>();
poolUpdate.eq(AdmSchedulePool::getId, slot.getPoolId())
.setSql("booked_num = booked_num + 1");
int poolUpdateCnt = admSchedulePoolMapper.update(null, poolUpdate);
if (poolUpdateCnt != 1) {
throw new BusinessException("排班池已预约数量更新失败");
}
} }
/** /**
* 创建预约挂号业务 * 仅预约成功（未支付）时调用，用于累计 pool 的 booked_num。
* *
* @param poolId 号源池主键 * @param poolId 所属排班池主键
* @param slotId 排班号槽主键
* @param patientId 患者主键
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void createAppointment(Long poolId, Long slotId, Long patientId) { public void incrementBookedNum(Long poolId) {
// 1. 基础校验 LambdaUpdateWrapper<AdmSchedulePool> wrapper = new LambdaUpdateWrapper<>();
var pool = admSchedulePoolMapper.selectById(poolId); wrapper.eq(AdmSchedulePool::getId, poolId)
if (pool == null) { .setSql("booked_num = booked_num + 1");
throw new BusinessException("号源池不存在"); int cnt = admSchedulePoolMapper.update(null, wrapper);
} if (cnt != 1) {
if (pool.getBookedNum() >= pool.getTotalNum()) { throw new BusinessException("预约成功后更新排班池 booked_num 失败");
throw new BusinessException("当前号源已满，无法预约");
}
// 2. 落库预约记录/订单（业务省略，实际会插入 Appointment/Order 表）
// ...
// 3. 修复 Bug #575：预约成功后，使用原子 SQL 实时累加 booked_num，避免并发覆盖
LambdaUpdateWrapper<AdmSchedulePool> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(AdmSchedulePool::getId, poolId)
.setSql("booked_num = booked_num + 1");
int rows = admSchedulePoolMapper.update(null, updateWrapper);
if (rows <= 0) {
throw new BusinessException("号源状态更新失败，预约未生效");
} }
} }
} }