|
@@ -161,7 +161,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
|
|
throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
|
|
throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
|
|
}
|
|
}
|
|
// 2.3 校验支付金额一致
|
|
// 2.3 校验支付金额一致
|
|
- if (notEqual(payOrder.getPrice(), order.getPrice())) {
|
|
|
|
|
|
+ if (notEqual(payOrder.getPrice(), convertPrice(order.getPrice()))) {
|
|
log.error("[validateOrderCanPaid][order({}) payOrder({}) 支付金额不匹配,请进行处理!order 数据是:{},payOrder 数据是:{}]",
|
|
log.error("[validateOrderCanPaid][order({}) payOrder({}) 支付金额不匹配,请进行处理!order 数据是:{},payOrder 数据是:{}]",
|
|
id, payOrderId, toJsonString(order), toJsonString(payOrder));
|
|
id, payOrderId, toJsonString(order), toJsonString(payOrder));
|
|
throw exception(ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
|
|
throw exception(ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
|
|
@@ -216,7 +216,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
|
|
public void updateOrderRefunded(Long id, Long payRefundId) {
|
|
public void updateOrderRefunded(Long id, Long payRefundId) {
|
|
// 1. 校验并获得退款订单(可退款)
|
|
// 1. 校验并获得退款订单(可退款)
|
|
PayRefundRespDTO payRefund = validateOrderCanRefunded(id, payRefundId);
|
|
PayRefundRespDTO payRefund = validateOrderCanRefunded(id, payRefundId);
|
|
- // 2.2 更新退款单到 demo 订单
|
|
|
|
|
|
+ // 2.2 更新退款单到 订单
|
|
tradeOrderMapper.updateById(new TradeOrderDO().setId(id)
|
|
tradeOrderMapper.updateById(new TradeOrderDO().setId(id)
|
|
.setRefundTime(payRefund.getSuccessTime()));
|
|
.setRefundTime(payRefund.getSuccessTime()));
|
|
}
|
|
}
|
|
@@ -228,8 +228,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
|
|
throw exception(ORDER_NOT_FOUND);
|
|
throw exception(ORDER_NOT_FOUND);
|
|
}
|
|
}
|
|
// 1.2 校验退款订单匹配
|
|
// 1.2 校验退款订单匹配
|
|
- if (Objects.equals(order.getPayRefundId(), payRefundId)) {
|
|
|
|
- log.error("[validateOrderCanRefunded][order({}) 退款单不匹配({}),请进行处理!order 数据是:{}]",
|
|
|
|
|
|
+ if (Objects.equals(order.getPayOrderId(), payRefundId)) {
|
|
|
|
+ log.error("[validateDemoOrderCanRefunded][order({}) 退款单不匹配({}),请进行处理!order 数据是:{}]",
|
|
id, payRefundId, toJsonString(order));
|
|
id, payRefundId, toJsonString(order));
|
|
throw exception(ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR);
|
|
throw exception(ORDER_REFUND_FAIL_REFUND_ORDER_ID_ERROR);
|
|
}
|
|
}
|