From 88dc763b90a44482fc407c8a970b44390301cf4d Mon Sep 17 00:00:00 2001 From: Derran Date: Sun, 5 May 2024 15:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentorderrefund/entity/PaymentOrderRefund.java | 3 +++ .../marriagebounty/MarriageBountyOrderApplicationService.java | 1 + .../processor/wechat/WeChatPayProcessor.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java index 135b51e..f9b6be0 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/paymentorderrefund/entity/PaymentOrderRefund.java @@ -22,6 +22,9 @@ public class PaymentOrderRefund extends Entity { @ApiModelProperty("支付单号") private Long paymentOrderId; + @ApiModelProperty("渠道支付单号") + private Long paymentChannelOrder; + @ApiModelProperty("付款方式") private PaymentMethodEnum paymentMethod; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java index 510503c..6637bf1 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/marriagebounty/MarriageBountyOrderApplicationService.java @@ -133,6 +133,7 @@ public class MarriageBountyOrderApplicationService extends BaseApplicationServic } paymentOrderRefund.setTradeOrderId(paymentOrder.getOrderId()); paymentOrderRefund.setPaymentOrderId(paymentOrder.getId()); + paymentOrderRefund.setPaymentChannelOrder(paymentChannelOrder.getId()); paymentOrderRefund.setPaymentMethod(paymentOrder.getPaymentMethod()); paymentOrderRefund.setTransactionId(paymentChannelOrder.getExtOrderNo()); paymentOrderRefund.setOrderAmount(paymentChannelOrder.getAmount()); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java index 731f129..6dd92a0 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/paymentchannelorder/processor/wechat/WeChatPayProcessor.java @@ -93,7 +93,7 @@ public class WeChatPayProcessor extends IChannelPayService { public void refund(PaymentOrderRefund paymentOrderRefund) { try { Map reqParams = new HashMap<>(); - reqParams.put("out_trade_no", paymentOrderRefund.getPaymentOrderId().toString()); + reqParams.put("out_trade_no", paymentOrderRefund.getPaymentChannelOrder().toString()); reqParams.put("out_refund_no", paymentOrderRefund.getId().toString()); reqParams.put("amount", new HashMap() { {