From 7f36c8b49b888cbf440ea400336a11abf4cab018 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 01 四月 2025 11:19:40 +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.HttpApi/LifePay/WxPayNotifyController.cs |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/LifePayment/LifePayment.HttpApi/LifePay/WxPayNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/WxPayNotifyController.cs
index 970139a..5dc1ddd 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/WxPayNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/WxPayNotifyController.cs
@@ -102,19 +102,17 @@
 
                 if (wxPayNotice.OutTradeNo.Contains("JF"))
                 {
-                    if (wxPayNotice.RefundStatus == LifePaymentConstant.WxPayRefundStatus.閫�娆炬垚鍔�)
-                    {
-                        
-                    }
+                   
                     switch (wxPayNotice.RefundStatus)
                     {
                         case LifePaymentConstant.WxPayRefundStatus.閫�娆炬垚鍔�:
                         case LifePaymentConstant.WxPayRefundStatus.閫�娆惧叧闂�:
-                            await _lifePayService.WxPayDomesticRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.宸查��娆�);
+                            await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.宸查��娆�);
                             // 鎻掑叆鏀舵敮娴佹按
                             await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
                             {
                                 OrderNo = wxPayNotice.OutTradeNo,
+                                OutRefundNo = wxPayNotice.OutRefundNo,
                                 OutOrderNo = wxPayNotice.TransactionId,
                                 LifePayType = LifePayTypeEnum.WxPay,
                                 ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts,
@@ -122,12 +120,12 @@
                             });
                             break;
                         case LifePaymentConstant.WxPayRefundStatus.閫�娆惧鐞嗕腑:
-                            await _lifePayService.WxPayDomesticRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);
+                            await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);
                             break;
                         case LifePaymentConstant.WxPayRefundStatus.閫�娆惧紓甯�:
-                            await _lifePayService.WxPayDomesticRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);
+                            await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);
                             break;
-                        default : await _lifePayService.WxPayDomesticRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);break;
+                        default : await _lifePayService.LifePayRefundsHandler(wxPayNotice.OutTradeNo, LifePayRefundStatusEnum.閫�娆句腑);break;
                     }
                 }
             }

--
Gitblit v1.9.1