|
|
@ -561,7 +561,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
order.setRefundTime(new Date()); |
|
|
|
order.setRefundTime(new Date()); |
|
|
|
order.setOrderStatus(OrderStatus.STATUS4.getNumber()); |
|
|
|
order.setOrderStatus(OrderStatus.STATUS4.getNumber()); |
|
|
|
|
|
|
|
|
|
|
|
/*// 退回金额,原路返回
|
|
|
|
// 退回金额,原路返回
|
|
|
|
RefundPriceModel refundPrice = orderRefundService.refundPrice(refundOrderNo |
|
|
|
RefundPriceModel refundPrice = orderRefundService.refundPrice(refundOrderNo |
|
|
|
, order |
|
|
|
, order |
|
|
|
, OrderPayType.getDataByType(order.getPayType()) |
|
|
|
, OrderPayType.getDataByType(order.getPayType()) |
|
|
@ -569,13 +569,13 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
, order.getPayGold()); |
|
|
|
, order.getPayGold()); |
|
|
|
if (!refundPrice.getRefundSuccess()) { |
|
|
|
if (!refundPrice.getRefundSuccess()) { |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败,请稍后重试"); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败,请稍后重试"); |
|
|
|
}*/ |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<HighOrderRefund> refundList = orderRefundService.getRefundByRefundNo(refundOrderNo); |
|
|
|
List<HighOrderRefund> refundList = orderRefundService.getRefundByRefundNo(refundOrderNo); |
|
|
|
for (HighOrderRefund orderRefund : refundList) { |
|
|
|
for (HighOrderRefund orderRefund : refundList) { |
|
|
|
orderRefund.setRefundStatus(OrderRefundStatus.STATUS2.getNumber()); |
|
|
|
orderRefund.setRefundStatus(OrderRefundStatus.STATUS2.getNumber()); |
|
|
|
orderRefund.setRefundTime(new Date()); |
|
|
|
orderRefund.setRefundTime(new Date()); |
|
|
|
//orderRefund.setThirdPartyRefundOrderNo(refundPrice.getThirdPartyRefundOrderNo());
|
|
|
|
orderRefund.setThirdPartyRefundOrderNo(refundPrice.getThirdPartyRefundOrderNo()); |
|
|
|
orderRefundService.update(orderRefund); |
|
|
|
orderRefundService.update(orderRefund); |
|
|
|
|
|
|
|
|
|
|
|
rocketMQTemplate.syncSend(OrderTopic.ORDER_TOPIC_REFUND_SUCCESS.getTopic(), orderRefund); |
|
|
|
rocketMQTemplate.syncSend(OrderTopic.ORDER_TOPIC_REFUND_SUCCESS.getTopic(), orderRefund); |
|
|
|