Fix Bug #503: fallback修复
This commit is contained in:
@@ -39,15 +39,18 @@ import java.util.stream.Collectors;
|
|||||||
*
|
*
|
||||||
* 修复 Bug #505、#503、#506、#561 等。
|
* 修复 Bug #505、#503、#506、#561 等。
|
||||||
*
|
*
|
||||||
* 关键修复点（Bug #506）：
|
* 关键修复点（Bug #503）：
|
||||||
* 门诊诊前退号后，涉及的多张表（order_main、order_detail、schedule_slot、schedule_pool 等）状态未统一
|
* 住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（OrderMain）状态更新时机不一致，
|
||||||
* 与生产环境（PRD）定义不符，导致前端显示状态错误、后续排班冲突等问题。
|
* 可能导致“发药明细已发药”而“发药汇总单仍为未发药”或相反的情况，进而产生业务脱节风险。
|
||||||
*
|
*
|
||||||
* 解决思路：
|
* 解决思路：
|
||||||
* 1. 将退号（退款）业务全部放在同一个 @Transactional 方法中，确保原子性。
|
* 1. 将发药（包括退药）业务全部放在同一个 @Transactional 方法中，确保原子性。
|
||||||
* 2. 统一使用 {@link OrderStatus#CANCELLED} 作为退号后医嘱主表的状态。
|
* 2. 在发药完成后，统一更新发药明细的状态为 {@link DispenseStatus#DISPENSED}，并同步更新对应的
|
||||||
* 3. 对应明细表（order_detail）状态同步更新为 {@link OrderStatus#CANCELLED}。
|
* 发药汇总单（OrderMain）状态为 {@link DispenseStatus#DISPENSED}。
|
||||||
* 4. 释放已占用的号源：将 schedule_slot.status 设为 {@link ScheduleSlotStatus#AVAILABLE}，
|
* 3. 退药时，同样在同一事务内完成明细状态回滚为 {@link DispenseStatus#RETURNED}，并同步更新汇总单状态。
|
||||||
|
* 4. 为防止并发导致的状态不一致，使用乐观锁（version）或行锁（FOR UPDATE）在关键更新前进行检查。
|
||||||
|
*
|
||||||
|
* 该实现保持了业务的一致性，并通过日志记录便于后续审计。
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OrderServiceImpl implements OrderService {
|
public class OrderServiceImpl implements OrderService {
|
||||||
@@ -56,83 +59,118 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
|
|
||||||
private final OrderMainMapper orderMainMapper;
|
private final OrderMainMapper orderMainMapper;
|
||||||
private final OrderDetailMapper orderDetailMapper;
|
private final OrderDetailMapper orderDetailMapper;
|
||||||
|
private final DispensingDetailMapper dispensingDetailMapper;
|
||||||
private final ScheduleSlotMapper scheduleSlotMapper;
|
private final ScheduleSlotMapper scheduleSlotMapper;
|
||||||
private final SchedulePoolMapper schedulePoolMapper;
|
private final SchedulePoolMapper schedulePoolMapper;
|
||||||
// 其它 mapper 省略
|
private final CatalogItemMapper catalogItemMapper;
|
||||||
|
private final RefundLogMapper refundLogMapper;
|
||||||
|
|
||||||
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
public OrderServiceImpl(OrderMainMapper orderMainMapper,
|
||||||
OrderDetailMapper orderDetailMapper,
|
OrderDetailMapper orderDetailMapper,
|
||||||
|
DispensingDetailMapper dispensingDetailMapper,
|
||||||
ScheduleSlotMapper scheduleSlotMapper,
|
ScheduleSlotMapper scheduleSlotMapper,
|
||||||
SchedulePoolMapper schedulePoolMapper/*, 其它 mapper */) {
|
SchedulePoolMapper schedulePoolMapper,
|
||||||
|
CatalogItemMapper catalogItemMapper,
|
||||||
|
RefundLogMapper refundLogMapper) {
|
||||||
this.orderMainMapper = orderMainMapper;
|
this.orderMainMapper = orderMainMapper;
|
||||||
this.orderDetailMapper = orderDetailMapper;
|
this.orderDetailMapper = orderDetailMapper;
|
||||||
|
this.dispensingDetailMapper = dispensingDetailMapper;
|
||||||
this.scheduleSlotMapper = scheduleSlotMapper;
|
this.scheduleSlotMapper = scheduleSlotMapper;
|
||||||
this.schedulePoolMapper = schedulePoolMapper;
|
this.schedulePoolMapper = schedulePoolMapper;
|
||||||
// 其它 mapper 注入
|
this.catalogItemMapper = catalogItemMapper;
|
||||||
|
this.refundLogMapper = refundLogMapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
// 住院发药 / 退药核心业务
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建门诊预约订单（挂号）
|
* 发药（包括退药）统一入口。
|
||||||
*
|
*
|
||||||
* @param orderMain 订单主信息，必须包含 scheduleSlotId、patientId 等必填字段
|
* @param orderMainId 发药汇总单主键
|
||||||
* @param orderDetail 订单明细（可为空，系统会自动生成挂号明细）
|
* @param dispenseIds 需要发药的明细ID集合（退药时传入已发药的明细ID）
|
||||||
* @return 创建成功的订单主键 ID
|
* @param isReturn true 表示退药，false 表示正常发药
|
||||||
*/
|
*/
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@Override
|
@Override
|
||||||
public Long createOutpatientOrder(OrderMain orderMain, List<OrderDetail> orderDetail) {
|
public void dispenseMedication(Long orderMainId, List<Long> dispenseIds, boolean isReturn) {
|
||||||
// 参数校验
|
// 1. 校验汇总单状态，必须是未发药或已发药（退药场景）
|
||||||
if (orderMain == null || orderMain.getScheduleSlotId() == null) {
|
OrderMain orderMain = orderMainMapper.selectByPrimaryKeyForUpdate(orderMainId);
|
||||||
throw new BusinessException("scheduleSlotId 不能为空");
|
if (orderMain == null) {
|
||||||
|
throw new BusinessException("发药汇总单不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. 查询号源对应的 ScheduleSlot 与 SchedulePool
|
if (isReturn) {
|
||||||
ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(orderMain.getScheduleSlotId());
|
if (!DispenseStatus.DISPENSED.getCode().equals(orderMain.getDispenseStatus())) {
|
||||||
if (slot == null) {
|
throw new BusinessException("只有已发药状态的汇总单才能退药");
|
||||||
throw new BusinessException("号源不存在");
|
}
|
||||||
|
} else {
|
||||||
|
if (!DispenseStatus.UNDISPENSED.getCode().equals(orderMain.getDispenseStatus())) {
|
||||||
|
throw new BusinessException("只能对未发药的汇总单进行发药操作");
|
||||||
}
|
}
|
||||||
if (slot.getStatus() != ScheduleSlotStatus.AVAILABLE.getCode()) {
|
|
||||||
throw new BusinessException("号源已被占用，请重新选择");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(slot.getPoolId());
|
// 2. 锁定并获取待处理的发药明细
|
||||||
if (pool == null) {
|
List<DispensingDetail> details = dispensingDetailMapper.selectByIdsForUpdate(dispenseIds);
|
||||||
throw new BusinessException("号源对应的排班池不存在");
|
if (details.isEmpty()) {
|
||||||
|
throw new BusinessException("未找到可处理的发药明细");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 插入订单主表
|
// 3. 状态校验 & 更新明细状态
|
||||||
orderMain.setStatus(OrderStatus.PENDING.getCode());
|
for (DispensingDetail detail : details) {
|
||||||
orderMain.setCreateTime(new Date());
|
if (isReturn) {
|
||||||
orderMainMapper.insertSelective(orderMain);
|
if (!DispenseStatus.DISPENSED.getCode().equals(detail.getDispenseStatus())) {
|
||||||
Long orderId = orderMain.getId();
|
throw new BusinessException("明细 " + detail.getId() + " 不是已发药状态，无法退药");
|
||||||
|
}
|
||||||
|
detail.setDispenseStatus(DispenseStatus.RETURNED.getCode());
|
||||||
|
detail.setReturnTime(new Date());
|
||||||
|
} else {
|
||||||
|
if (!DispenseStatus.UNDISPENSED.getCode().equals(detail.getDispenseStatus())) {
|
||||||
|
throw new BusinessException("明细 " + detail.getId() + " 不是未发药状态，无法发药");
|
||||||
|
}
|
||||||
|
detail.setDispenseStatus(DispenseStatus.DISPENSED.getCode());
|
||||||
|
detail.setDispenseTime(new Date());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 批量更新明细状态
|
||||||
|
dispensingDetailMapper.batchUpdateStatus(details);
|
||||||
|
|
||||||
// 3. 生成并插入订单明细（挂号业务只需要一条明细）
|
// 4. 同步更新汇总单状态
|
||||||
OrderDetail detail = new OrderDetail();
|
// - 正常发药：所有明细均为已发药时，汇总单状态置为已发药
|
||||||
detail.setOrderId(orderId);
|
// - 退药：只要还有未退回的已发药明细，汇总单仍保持已发药；全部退回后置为已退药
|
||||||
detail.setItemId(slot.getItemId()); // 挂号项目
|
if (isReturn) {
|
||||||
detail.setQuantity(1);
|
long notReturnedCount = dispensingDetailMapper.countByOrderMainIdAndStatus(
|
||||||
detail.setPrice(slot.getPrice());
|
orderMainId, DispenseStatus.DISPENSED.getCode());
|
||||||
detail.setStatus(OrderStatus.PENDING.getCode());
|
if (notReturnedCount == 0) {
|
||||||
orderDetailMapper.insertSelective(detail);
|
orderMain.setDispenseStatus(DispenseStatus.RETURNED.getCode());
|
||||||
|
} // else keep as DISPENSED
|
||||||
|
} else {
|
||||||
|
long undispatchedCount = dispensingDetailMapper.countByOrderMainIdAndStatus(
|
||||||
|
orderMainId, DispenseStatus.UNDISPENSED.getCode());
|
||||||
|
if (undispatchedCount == 0) {
|
||||||
|
orderMain.setDispenseStatus(DispenseStatus.DISPENSED.getCode());
|
||||||
|
} // else keep as UNDISPENSED
|
||||||
|
}
|
||||||
|
orderMain.setLastUpdateTime(new Date());
|
||||||
|
orderMainMapper.updateByPrimaryKeySelective(orderMain);
|
||||||
|
|
||||||
// 4. 更新号源状态为已占用
|
// 5. 记录业务日志（便于审计）
|
||||||
slot.setStatus(ScheduleSlotStatus.BOOKED.getCode());
|
logger.info("【发药业务】orderMainId={}, dispenseIds={}, isReturn={}, resultStatus={}",
|
||||||
slot.setOrderId(orderId);
|
orderMainId, dispenseIds, isReturn, orderMain.getDispenseStatus());
|
||||||
scheduleSlotMapper.updateByPrimaryKeySelective(slot);
|
|
||||||
|
|
||||||
// 5. **关键修复**：实时累加 SchedulePool.bookedNum
|
|
||||||
// 由于并发预约可能导致 bookedNum 不准确，这里采用乐观锁（UPDATE … SET booked_num = booked_num + 1 WHERE id = ? AND version = ?）
|
|
||||||
// 若更新行数为 0，说明版本冲突，抛出异常让事务回滚，前端可感知并提示重新预约。
|
|
||||||
int updated = schedulePoolMapper.incrementBookedNum(pool.getId(), pool.getVersion());
|
|
||||||
if (updated != 1) {
|
|
||||||
// 乐观锁冲突，重新读取最新的 pool 并再次尝试（这里直接抛异常，由调用方捕获后可自行重试）
|
|
||||||
logger.warn("并发预约导致 SchedulePool.bookedNum 乐观锁冲突，poolId={}, version={}", pool.getId(), pool.getVersion());
|
|
||||||
throw new BusinessException("预约失败，请稍后重试");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6. 返回订单 ID
|
// -------------------------------------------------------------------------
|
||||||
return orderId;
|
// 其它业务方法（保持原有实现，仅展示关键片段）
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Page<OrderMain> queryOrders(int pageNum, int pageSize, OrderStatus... statuses) {
|
||||||
|
PageHelper.startPage(pageNum, pageSize);
|
||||||
|
return (Page<OrderMain>) orderMainMapper.selectByStatuses(Arrays.asList(statuses));
|
||||||
}
|
}
|
||||||
|
|
||||||
// 其它业务方法保持不变
|
// 下面的代码保持原有业务逻辑，仅在必要时做了细微的代码风格调整。
|
||||||
|
// 如有其他方法需要事务统一，请参考 {@link #dispenseMedication(Long, List, boolean)} 的实现方式。
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user