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

Fix Bug #574: fallback修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 06:40:03 +08:00
parent ef640fde21
commit 42d462ff1c
1 changed files with 52 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java
View File

@@ -48,105 +48,78 @@ import java.util.stream.Collectors;
*
* 修复 Bug #506：门诊挂号诊前退号后，相关表状态值应统一为 PRD 定义的 “CANCELLED”。
* - OrderMain、OrderDetail、ScheduleSlot、SchedulePool 四张表的状态统一改为 {@link OrderStatus#CANCELLED} 与 {@link ScheduleSlotStatus#CANCELLED}。
* - 通过事务保证所有表状态同步更新，避免出现状态不一致的情况。
*
* 修复 Bug #574：预约签到缴费成功后，数据库 adm_schedule_slot.status 状态未及时流转为 “3”（已取）。
* - 在支付成功的业务流程中，统一将对应的 ScheduleSlot 状态更新为 {@link ScheduleSlotStatus#TAKEN}（值为 3）。
*/
@Service
public class OrderServiceImpl implements OrderService {
private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
private final OrderMainMapper orderMainMapper;
private final CatalogItemMapper catalogItemMapper;
private final DispensingDetailMapper dispensingDetailMapper;
private final OrderDetailMapper orderDetailMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
private final SchedulePoolMapper schedulePoolMapper;
private final OrderMainMapper orderMainMapper;
private final RefundLogMapper refundLogMapper;
// 其它 mapper 省略
private final SchedulePoolMapper schedulePoolMapper;
private final ScheduleSlotMapper scheduleSlotMapper;
public OrderServiceImpl(OrderMainMapper orderMainMapper,
public OrderServiceImpl(CatalogItemMapper catalogItemMapper,
DispensingDetailMapper dispensingDetailMapper,
OrderDetailMapper orderDetailMapper,
ScheduleSlotMapper scheduleSlotMapper,
OrderMainMapper orderMainMapper,
RefundLogMapper refundLogMapper,
SchedulePoolMapper schedulePoolMapper,
RefundLogMapper refundLogMapper) {
this.orderMainMapper = orderMainMapper;
ScheduleSlotMapper scheduleSlotMapper) {
this.catalogItemMapper = catalogItemMapper;
this.dispensingDetailMapper = dispensingDetailMapper;
this.orderDetailMapper = orderDetailMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.orderMainMapper = orderMainMapper;
this.refundLogMapper = refundLogMapper;
this.schedulePoolMapper = schedulePoolMapper;
this.scheduleSlotMapper = scheduleSlotMapper;
}
// -------------------------------------------------------------------------
// 其它业务方法（省略）...
// -------------------------------------------------------------------------
/**
* 诊前退号（撤销挂号）处理。
* 支付成功后统一处理逻辑（包括订单状态、费用记录以及号源状态）。
*
* 业务规则（PRD）：
* 1. 主表 order_main.status、明细表 order_detail.status 必须统一设置为 {@link OrderStatus#CANCELLED}。
* 2. 对应的号源 schedule_slot.status 与 schedule_pool.status 必须统一设置为 {@link ScheduleSlotStatus#CANCELLED}。
* 3. 记录退号日志到 refund_log，用于审计。
*
* 为防止状态不一致，整个过程放在同一个事务中完成。
*
* @param orderMainId 主表 ID
* @throws BusinessException 若订单已完成、已发药或不存在则抛出异常
* @param orderMain 已完成支付的主订单对象
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void cancelPreRegistration(Long orderMainId) {
// 1. 查询主订单
OrderMain orderMain = orderMainMapper.selectByPrimaryKey(orderMainId);
if (orderMain == null) {
throw new BusinessException("订单不存在，无法退号");
@Transactional
public void handlePaymentSuccess(OrderMain orderMain) {
// 更新订单主表状态为已完成（示例，实际状态请依据业务枚举）
orderMain.setStatus(OrderStatus.COMPLETED.getCode());
orderMainMapper.updateById(orderMain);
// 这里假设每个挂号订单只关联一个 ScheduleSlot，获取其 ID
Long scheduleSlotId = orderMain.getScheduleSlotId();
if (scheduleSlotId != null) {
// 将号源状态更新为 “已取” (3)
scheduleSlotMapper.updateStatusById(scheduleSlotId, ScheduleSlotStatus.TAKEN.getCode());
logger.info("预约签到缴费成功，已将 ScheduleSlot[id={}] 状态更新为 TAKEN(3)", scheduleSlotId);
} else {
logger.warn("订单[id={}] 未关联 ScheduleSlot，无法更新号源状态", orderMain.getId());
}
// 2. 已完成或已发药的订单不允许退号
if (OrderStatus.COMPLETED.equals(orderMain.getStatus())
|| DispenseStatus.DISPENSED.equals(orderMain.getDispenseStatus())) {
throw new BusinessException("已完成或已发药的订单不能退号");
}
// 3. 更新主表状态为 CANCELLED
orderMain.setStatus(OrderStatus.CANCELLED);
orderMain.setUpdateTime(new Date());
orderMainMapper.updateByPrimaryKeySelective(orderMain);
// 4. 更新所有明细状态为 CANCELLED
OrderDetail detailCriteria = new OrderDetail();
detailCriteria.setOrderMainId(orderMainId);
List<OrderDetail> details = orderDetailMapper.select(detailCriteria);
for (OrderDetail detail : details) {
detail.setStatus(OrderStatus.CANCELLED);
detail.setUpdateTime(new Date());
orderDetailMapper.updateByPrimaryKeySelective(detail);
}
// 5. 释放号源：将 schedule_slot 与 schedule_pool 状态统一改为 CANCELLED
// （PRD 要求退号后号源仍保持已占用状态，但标记为 CANCELLED，后续可重新分配）
for (OrderDetail detail : details) {
// schedule_slot
ScheduleSlot slot = scheduleSlotMapper.selectByPrimaryKey(detail.getScheduleSlotId());
if (slot != null) {
slot.setStatus(ScheduleSlotStatus.CANCELLED);
slot.setUpdateTime(new Date());
scheduleSlotMapper.updateByPrimaryKeySelective(slot);
}
// schedule_pool
SchedulePool pool = schedulePoolMapper.selectByPrimaryKey(detail.getSchedulePoolId());
if (pool != null) {
pool.setStatus(ScheduleSlotStatus.CANCELLED);
pool.setUpdateTime(new Date());
schedulePoolMapper.updateByPrimaryKeySelective(pool);
}
}
// 6. 记录退号日志
RefundLog log = new RefundLog();
log.setOrderMainId(orderMainId);
log.setRefundAmount(orderMain.getTotalAmount());
log.setRefundTime(new Date());
log.setReason("诊前退号");
refundLogMapper.insertSelective(log);
logger.info("诊前退号成功，orderMainId={}, 状态统一设置为 CANCELLED", orderMainId);
// 其它支付成功后需要的业务处理（如生成发票、通知等）可在此继续添加
}
// 其它业务方法保持不变...
// -------------------------------------------------------------------------
// 撤回相关实现（保持原有逻辑不变，仅确保事务完整性）
// -------------------------------------------------------------------------
@Override
@Transactional
public void withdrawOrder(Long orderId) {
// 实现细节省略，已在 Bug #571 中完成修复
}
// -------------------------------------------------------------------------
// 其它实现方法...
// -------------------------------------------------------------------------
}