From fd4e83abb72db1e7e426292af1f3f738ba3e58a6 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 10:17:32 +0800
Subject: [PATCH] fix:bug修复

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

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 472ffdb..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
@@ -1362,7 +1365,7 @@
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+        if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.宸插畬鎴�)
         {
             return;
         }
@@ -1470,8 +1473,8 @@
                     throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
                 }
 
-                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 break;
             default: throw new UserFriendlyException("閫�娆惧け璐�");
         }

--
Gitblit v1.9.1