|
@@ -136,9 +136,15 @@ public class AdminOrderService {
|
|
|
return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
|
|
return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
// 设置订单取消状态
|
|
// 设置订单取消状态
|
|
|
order.setOrderStatus(OrderUtil.STATUS_REFUND_CONFIRM);
|
|
order.setOrderStatus(OrderUtil.STATUS_REFUND_CONFIRM);
|
|
|
- order.setEndTime(LocalDateTime.now());
|
|
|
|
|
|
|
+ order.setEndTime(now);
|
|
|
|
|
+ // 记录订单退款相关信息
|
|
|
|
|
+ order.setRefundAmount(order.getActualPrice());
|
|
|
|
|
+ order.setRefundType("微信退款接口");
|
|
|
|
|
+ order.setRefundContent(wxPayRefundResult.getRefundId());
|
|
|
|
|
+ order.setRefundTime(now);
|
|
|
if (orderService.updateWithOptimisticLocker(order) == 0) {
|
|
if (orderService.updateWithOptimisticLocker(order) == 0) {
|
|
|
throw new RuntimeException("更新数据已失效");
|
|
throw new RuntimeException("更新数据已失效");
|
|
|
}
|
|
}
|