|
@@ -3807,11 +3807,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
|
+ @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.UPDATE_ORDER_STATUS)
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
|
|
public CommonResult<?> updateStatus(Long orderId, Integer status) {
|
|
public CommonResult<?> updateStatus(Long orderId, Integer status) {
|
|
|
TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
|
|
TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
|
|
|
if (tradeOrderDO == null) {
|
|
if (tradeOrderDO == null) {
|
|
|
return CommonResult.error(ORDER_NOT_EXIST);
|
|
return CommonResult.error(ORDER_NOT_EXIST);
|
|
|
}
|
|
}
|
|
|
|
|
+ Integer orderStatus = tradeOrderDO.getOrderStatus();
|
|
|
// 延迟过期时间
|
|
// 延迟过期时间
|
|
|
LocalDateTime delayExpireTime = tradeOrderDO.getDelayExpireTime();
|
|
LocalDateTime delayExpireTime = tradeOrderDO.getDelayExpireTime();
|
|
|
// 判断延迟过期时间是否过期
|
|
// 判断延迟过期时间是否过期
|
|
@@ -3844,6 +3847,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
|
|
|
log.info("订单修改为留位状态成功,已发送{}小时自动取消延迟消息:orderId={}", autoClearTime,orderId);
|
|
log.info("订单修改为留位状态成功,已发送{}小时自动取消延迟消息:orderId={}", autoClearTime,orderId);
|
|
|
tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("delay_expire_time", expireDateTime).eq("id", orderId));
|
|
tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("delay_expire_time", expireDateTime).eq("id", orderId));
|
|
|
}
|
|
}
|
|
|
|
|
+ Map<String, Object> append = TradeOrderLogUtils.append("result", "修改订单状态成功");
|
|
|
|
|
+ TradeOrderLogUtils.setOrderInfo(orderId, orderStatus, status, append);
|
|
|
return CommonResult.success("修改成功");
|
|
return CommonResult.success("修改成功");
|
|
|
}
|
|
}
|
|
|
|
|
|