From a3f1926a7530fd4a3b9196824a8e8b00c693e6e3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 01 四月 2025 11:11:50 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 8053980..8d5907a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -848,15 +848,18 @@
     /// <returns></returns>
     public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
     {
+        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo || x.RefundOrderNo == input.OutRefundNo).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
+        input.OutTradeNo = order.OrderNo;
+        input.OutRefundNo = order.RefundOrderNo;
         var result = await _aliPayApi.QueryAlipayTradeRefund(input);
-        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo).FirstOrDefaultAsync();
         if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
         {
             order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
             order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
             await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
             {
-                OrderNo = result.OutTradeNo,
+                OrderNo = order.RefundOrderNo,
                 OutOrderNo = result.TradeNo,
                 LifePayType = LifePayTypeEnum.AliPay,
                 ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts

--
Gitblit v1.9.1