From fc5fc5bcb84ad464638008768932e47ad36c36af Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 18:22:53 +0800
Subject: [PATCH] fix:提交

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

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 4d09890..499e20d 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -28,6 +28,7 @@
 using NPOI.SS.Formula.Functions;
 using StackExchange.Redis;
 using static Volo.Abp.Identity.Settings.IdentitySettingNames;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace LifePayment.Application;
 
@@ -45,6 +46,7 @@
     private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
     private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
     private readonly IRepository<OperateHistory, Guid> _operateHistory;
+    private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
     private readonly IDataFilter dataFilter;
     private readonly IChannelFilter _channelFilter;
     private readonly IAliPayApi _aliPayApi;
@@ -63,6 +65,7 @@
                           IRepository<LifePayUser, Guid> lifePayUserRepository,
                           IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
                           IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
+                          IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
                           IRepository<OperateHistory, Guid> operateHistory,
                           IAliPayApi aliPayApi,
                           IAlipayInterfaceManager aliPayInterfaceManager,
@@ -79,6 +82,7 @@
         _lifePayRateRepository = lifePayRateRepository;
         _lifePayOrderRepository = lifePayOrderRepository;
         _lifePayUserRepository = lifePayUserRepository;
+        _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
         _lifePayPremiumRepository = lifePayPremiumRepository;
         _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
         _aliPayApi = aliPayApi;
@@ -841,6 +845,13 @@
     public async Task<AlipayTradeFastpayRefundQueryResponse> QueryAlipayTradeRefund(OrderInQuiryInput input)
     {
         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.宸查��娆�;
+        }
+
         return result;
     }
 
@@ -863,6 +874,8 @@
     {
         return await _wxPayApi.WxPayTradeQuery(outTradeNo);
     }
+
+  
 
     #endregion
 
@@ -1308,7 +1321,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, "璁㈠崟涓嶅瓨鍦�");
@@ -1326,6 +1339,7 @@
         }
     }
 
+
     /// <summary>
     /// ACOOLYO璁㈠崟閫氱煡澶勭悊
     /// </summary>
@@ -1337,10 +1351,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())
@@ -1362,6 +1376,27 @@
         order.ACOOLYStatus = acoolyStatus;
         order.FinishTime = DateTime.Now;
         await _lifePayOrderRepository.UpdateAsync(order);
+
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+        {
+            /// 姣涘埄
+            var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;
+            /// 娓犻亾浣ｉ噾  锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
+            var channlesRakePrice = grossProfit * (order.ChannlesRakeRate) / 100;
+            if (channlesRakePrice.HasValue)
+            {
+                LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
+                {
+                    OrderNo = order.OrderNo,
+                    PayAmount = order.PayAmount.Value,
+                    ChannlesRakeRate = order.ChannlesRakeRate.Value,
+                    ChannlesRakePrice = channlesRakePrice.Value,
+                    FinishTime = order.FinishTime.Value,
+                    ChannelId = order.ChannelId,
+                };
+                await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
+            }
+        }
     }
 
     /// <summary>
@@ -1564,7 +1599,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)
@@ -2005,7 +2040,6 @@
         string message = $"{method}\n{uri}\n{timestamp}\n{nonce}\n{body}\n";
         return message;
     }
-
 
     private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
     {

--
Gitblit v1.9.1