From 4e54aab4960fb97a549d9d715428b5374ecad6b5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期二, 10 六月 2025 18:25:38 +0800
Subject: [PATCH] fix:运营端--订单管理--退款管理--列表数据导出文件不正确 运营端--订单管理--列表数据导出文件不正确

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 6a80847..d2967c1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -308,7 +309,6 @@
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
                             }).GetPageResult(input.PageModel);
-
         return result;
     }
 
@@ -412,6 +412,7 @@
             s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
             s.RefundApplyTimeStr = !s.RefundApplyTime.HasValue ? string.Empty : s.RefundApplyTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
         });
+        CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
         return result;
     }
 
@@ -786,6 +787,7 @@
             s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
             s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
         });
+        CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
         return result;
     }
 
@@ -831,6 +833,7 @@
             s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
             s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
         });
+        CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
         return result;
     }
 
@@ -1349,6 +1352,7 @@
     public async Task LifePaySuccessHandler(string orderNo, string outOrderNo)
     {
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+        _logger.LogInformation($"姝ｅ湪澶勭悊璁㈠崟锛歿order?.Id}-{order?.PayStatus}");
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
         if (order.PayStatus != LifePayStatusEnum.鏈敮浠�)
@@ -1377,6 +1381,7 @@
                 default:
                     break;
             }
+            _logger.LogInformation("宸插悜渚涘簲鍟嗗彂璧疯鍗�");
 
             order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�;
             order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
@@ -1384,10 +1389,13 @@
             order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
             order.ACOOLYOrderNo = result.ACOOLYOrderNo;
             order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
+            await _lifePayOrderRepository.UpdateAsync(order);
+            _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
 
             /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
             await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
                                 order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
+            _logger.LogInformation("宸叉彃鍏ユ秷璐硅褰�");
         }
         catch (Exception ex)
         {
@@ -1396,10 +1404,9 @@
             order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
             order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
             order.RefundApplyRemark = ex.Message;
+            await _lifePayOrderRepository.UpdateAsync(order);
+            _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
         }
-
-        _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
-        await _lifePayOrderRepository.UpdateAsync(order);
     }
 
     public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
@@ -1791,6 +1798,9 @@
                 dto.PromoterId = promoter.Id;
             }
 
+            var rate = await _lifePayRateRepository.FirstOrDefaultAsync(it => it.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+            CheckExtensions.IfTrueThrowUserFriendlyException(rate != null && input.ChannlesRate < rate.Rate, "娓犻亾鎶樻墸鏃犳硶浣庝簬渚涘簲鍟嗘姌鎵�");
+
             dto.ChannlesName = input.ChannlesName;
             dto.ChannlesNum = input.ChannlesNum;
             dto.ChannlesRate = input.ChannlesRate;
@@ -1800,6 +1810,7 @@
             dto.AgentType = input.AgentType;
             dto.AreaProvinceId = input.AreaProvinceId;
             dto.AreaCityId = input.AreaCityId;
+
             #region 璁板綍鏃ュ織
 
             await LifePayOrderHistory("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);

--
Gitblit v1.9.1