From b83673da05917f71035b55d8736a3117e08e109f Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 18:53:33 +0800
Subject: [PATCH] fix:退款bug修复

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 41fde74..fd8cc08 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -29,6 +29,7 @@
 using StackExchange.Redis;
 using static Volo.Abp.Identity.Settings.IdentitySettingNames;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using LifePayment.Application.LifePay;
 
 namespace LifePayment.Application;
 
@@ -47,6 +48,7 @@
     private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
     private readonly IRepository<OperateHistory, Guid> _operateHistory;
     private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
+    private readonly ILifePayOrderService _lifePayOrderService;
     private readonly IDataFilter dataFilter;
     private readonly IChannelFilter _channelFilter;
     private readonly IAliPayApi _aliPayApi;
@@ -67,6 +69,7 @@
                           IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
                           IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
                           IRepository<OperateHistory, Guid> operateHistory,
+                          ILifePayOrderService lifePayOrderService,
                           IAliPayApi aliPayApi,
                           IAlipayInterfaceManager aliPayInterfaceManager,
                           IWxPayApi wxPayApi,
@@ -86,6 +89,7 @@
         _lifePayPremiumRepository = lifePayPremiumRepository;
         _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
         _aliPayApi = aliPayApi;
+        _lifePayOrderService = lifePayOrderService;
         _alipayInterfaceManager = aliPayInterfaceManager;
         _wxPayApi = wxPayApi;
         _wxPayOptions = wxPayOptions.Value;
@@ -850,6 +854,13 @@
         {
             order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
             order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+            {
+                OrderNo = result.OutTradeNo,
+                OutOrderNo = result.TradeNo,
+                LifePayType = LifePayTypeEnum.AliPay,
+                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+            });
         }
 
         return result;
@@ -1321,7 +1332,7 @@
         await _lifePayOrderRepository.UpdateAsync(order);
     }
 
-    public async Task WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
+    public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
     {
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1339,6 +1350,7 @@
         }
     }
 
+
     /// <summary>
     /// ACOOLYO璁㈠崟閫氱煡澶勭悊
     /// </summary>
@@ -1350,10 +1362,10 @@
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
-        //{
-        //    return;
-        //}
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+        {
+            return;
+        }
 
         order.PlatformDeductionAmount = payAmount;
         if (acoolyOrderNo.IsNotNullOrEmpty())
@@ -1430,7 +1442,6 @@
         }
 
         var outRefundNo = order.ChannelId + CreateRefundOrderNo();
-        order.RefundOrderNo = outRefundNo;
         switch (order.LifePayType)
         {
             case LifePayTypeEnum.WxPay:
@@ -1459,12 +1470,13 @@
                     throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
                 }
 
-                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 break;
             default: throw new UserFriendlyException("閫�娆惧け璐�");
         }
 
+        order.RefundOrderNo = outRefundNo;
         order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
         order.RefundCheckRemark = input.RefundCheckRemark;
         order.RefundTime = DateTime.Now;
@@ -1598,7 +1610,7 @@
             await _lifePayAccount.InsertAsync(userAccount);
         }
 
-        if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder)
+        if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder || input.LifePayType == LifePayOrderTypeEnum.ElectricOrder)
         {
             var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
             if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)

--
Gitblit v1.9.1