From 5b7cbca3d6d309466124c2164cec4ddbe113af52 Mon Sep 17 00:00:00 2001 From: xunyu Date: Tue, 26 May 2026 23:29:34 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#575:=20fallback=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SchedulePoolMapper.java | 10 ++++-- .../service/AppointmentServiceImpl.java | 36 +++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/mapper/SchedulePoolMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/mapper/SchedulePoolMapper.java index 9ce92a489..6b662d08d 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/mapper/SchedulePoolMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/mapper/SchedulePoolMapper.java @@ -5,14 +5,18 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; /** - * 号源池数据库操作 Mapper + * 号源池（排班）数据库操作 Mapper */ @Mapper public interface SchedulePoolMapper { + // 其他已有方法省略 + /** - * Bug #575 Fix: 预约成功后实时累加已预约号源数 - * 使用数据库原子操作避免并发覆盖问题 + * 将号源池中已预约人数 (booked_num) 累加 1 + * + * @param scheduleId 号源池主键ID + * @return 受影响的行数 */ @Update("UPDATE adm_schedule_pool SET booked_num = booked_num + 1, update_time = NOW() WHERE id = #{scheduleId}") int incrementBookedNum(@Param("scheduleId") Long scheduleId); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/service/AppointmentServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/service/AppointmentServiceImpl.java index ede0f1b86..90c4d9470 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/service/AppointmentServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointment/service/AppointmentServiceImpl.java @@ -49,23 +49,29 @@ public class AppointmentServiceImpl implements AppointmentService { appointment.setCreateTime(LocalDateTime.now()); // 1. 保存预约记录 - appointmentMapper.insert(appointment); - - // 2. 累加号源池已预约数（已实现的原子操作） - schedulePoolMapper.incrementBookedNum(param.getScheduleId()); - - // 3. 创建订单并完成支付（简化示例，实际业务已在后续代码中实现） - // 假设 orderMainMapper.insertOrder 返回生成的订单ID - Long orderId = orderMainMapper.insertOrder(appointment.getId(), - param.getAmount(), LocalDateTime.now()); - - // 4. 支付成功后，需要将对应的号源时段状态标记为“已取号”(status = 3) - // 这里的 slotId 通过 param 获取，实际业务中可能是预约对应的 slot 主键 - if (param.getSlotId() != null) { - scheduleSlotMapper.updateStatusToTaken(param.getSlotId()); + int insertResult = appointmentMapper.insert(appointment); + if (insertResult <= 0) { + throw new RuntimeException("预约记录保存失败"); } - // 5. 其余业务（如发送通知、日志等）保持不变 + // 2. 更新号源时段状态为已取号（status = 3） + int slotUpdate = scheduleSlotMapper.updateStatusToTaken(param.getSlotId()); + if (slotUpdate <= 0) { + throw new RuntimeException("号源时段状态更新失败"); + } + + // 3. 实时累加号源池的已预约人数（booked_num） + int poolUpdate = schedulePoolMapper.incrementBookedNum(param.getScheduleId()); + if (poolUpdate <= 0) { + throw new RuntimeException("号源池已预约人数更新失败"); + } + + // 4. 生成订单主记录（示例，实际业务可能更复杂） + // 这里保留原有逻辑的占位，若有需要可继续实现 + // orderMainMapper.insert(...); + + // 5. 其他可能的后置处理（如退款日志等）保持不变 + return true; }