From d0558ff1687a1bffd62c45660d4bab3132643039 Mon Sep 17 00:00:00 2001
From: lingling <kety1122@163.com>
Date: 星期三, 16 四月 2025 17:44:07 +0800
Subject: [PATCH] fix bug

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 1010 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 791 insertions(+), 219 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 0a8d5cf..7155429 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1,4 +1,5 @@
-锘縰sing LifePayment.Application.Contracts;
+锘縰sing Alipay.EasySDK.Payment.Common.Models;
+using LifePayment.Application.Contracts;
 using LifePayment.Domain;
 using LifePayment.Domain.LifePay;
 using LifePayment.Domain.Models;
@@ -19,10 +20,7 @@
 using Volo.Abp.EventBus.Distributed;
 using Z.EntityFramework.Plus;
 using ZeroD.Util;
-using Alipay.EasySDK.Payment.Common.Models;
 using static LifePayment.Domain.Shared.LifePaymentConstant;
-using ZeroD.Util.Fadd;
-using Nest;
 
 namespace LifePayment.Application;
 
@@ -36,13 +34,19 @@
     private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
     private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
     private readonly IRepository<LifePayIntroInfo, Guid> _lifePayIntroInfoRepository;
+    private readonly IRepository<DallyStatistics, Guid> _dallyStatisticsRepository;
     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 ILifePayOrderService _lifePayOrderService;
     private readonly IDataFilter dataFilter;
     private readonly IChannelFilter _channelFilter;
     private readonly IAliPayApi _aliPayApi;
+    private readonly IAlipayInterfaceManager _alipayInterfaceManager;
     private readonly IWxPayApi _wxPayApi;
     private readonly WxPayOption _wxPayOptions;
+    private readonly InitSetting _initSettingOptions;
 
     private readonly IACOOLYManager _aCOOLYManager;
 
@@ -54,9 +58,14 @@
                           IRepository<LifePayUser, Guid> lifePayUserRepository,
                           IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
                           IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
+                          IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
+                          IRepository<OperateHistory, Guid> operateHistory,
+                          ILifePayOrderService lifePayOrderService,
                           IAliPayApi aliPayApi,
+                          IAlipayInterfaceManager aliPayInterfaceManager,
                           IWxPayApi wxPayApi,
                           IOptions<WxPayOption> wxPayOptions,
+                          IOptions<InitSetting> initSettingOptions,
                           IRepository<LifePayChannles, Guid> lifePayChannlesRep,
                           IRepository<LifePayAccount, Guid> lifePayAccount,
                           IDataFilter dataFilter,
@@ -67,19 +76,25 @@
         _lifePayRateRepository = lifePayRateRepository;
         _lifePayOrderRepository = lifePayOrderRepository;
         _lifePayUserRepository = lifePayUserRepository;
+        _lifePayChannlesRakeRepository = lifePayChannlesRakeRepository;
         _lifePayPremiumRepository = lifePayPremiumRepository;
         _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
         _aliPayApi = aliPayApi;
+        _lifePayOrderService = lifePayOrderService;
+        _alipayInterfaceManager = aliPayInterfaceManager;
         _wxPayApi = wxPayApi;
         _wxPayOptions = wxPayOptions.Value;
+        _initSettingOptions = initSettingOptions.Value;
         _distributedEventBus = distributedEventBus;
         _lifePayChannlesRep = lifePayChannlesRep;
         _lifePayAccount = lifePayAccount;
         this.dataFilter = dataFilter;
         _channelFilter = channelFilter;
+        _operateHistory = operateHistory;
     }
 
     #region 鏌ヨ
+
 
     /// <summary>
     /// 鑾峰彇鐢佃垂闈㈠��
@@ -135,8 +150,18 @@
     /// <returns></returns>
     public async Task<List<LifePayRateListOutput>> GetRate()
     {
-        return await _lifePayRateRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })
+        return await _lifePayRateRepository.Select(x => new LifePayRateListOutput() { Id = x.Id, Rate = x.Rate, RateType = x.RateType })
                                            .ToListAsync();
+    }
+
+    /// <summary>
+    /// 鑾峰彇娓犻亾鎶樻墸
+    /// </summary>
+    /// <returns></returns>
+    public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
+    {
+        return _lifePayChannlesRep.Where(x => x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
+                                           .FirstOrDefault();
     }
 
     /// <summary>
@@ -145,7 +170,7 @@
     /// <returns></returns>
     public async Task<List<LifePayPremiumListOutput>> GetPremium()
     {
-        return await _lifePayPremiumRepository.Where(x => x.IsDeleted == false).Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })
+        return await _lifePayPremiumRepository.Select(x => new LifePayPremiumListOutput() { Id = x.Id, Rate = x.Rate, PremiumType = x.PremiumType })
                                            .ToListAsync();
     }
 
@@ -155,7 +180,7 @@
     /// <returns></returns>
     public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum lifePayType)
     {
-        return await _lifePayIntroInfoRepository.Where(x => x.IsDeleted == false && x.LifePayType == lifePayType).OrderBy(x => x.Sequence)
+        return await _lifePayIntroInfoRepository.Where(x => x.LifePayType == lifePayType).OrderBy(x => x.Sequence)
             .Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })
                                            .ToListAsync();
     }
@@ -167,9 +192,12 @@
     /// <returns></returns>
     public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
     {
-        return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository).Where(x => x.IsDeleted == false)
+        return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository)
             .WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) || x.Name.Contains(input.QueryCondition))
-            .WhereIf(input.CreationTime.HasValue, x => x.CreationTime.ToString("yyyy-MM-dd") == input.CreationTime.Value.ToString("yyyy-MM-dd"))
+            .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
+            .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
+            .WhereIf(input.LoginTimeBegin.HasValue, x => x.LastLoginTime >= input.LoginTimeBegin)
+            .WhereIf(input.LoginTimeEnd.HasValue, x => x.LastLoginTime <= input.LoginTimeEnd)
                                             .Select(x =>
                                                    new UserListOutput()
                                                    {
@@ -221,7 +249,9 @@
     /// <returns></returns>
     public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
     {
+        var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
         var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+                            .Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
                       .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
                                             .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
                                             .WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -229,35 +259,38 @@
                                             .WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
                                             .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
                                             .WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value)
+                                            .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
                                             .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
                                             .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
-                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
+                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || channles.Contains(x.ChannelId))
                             join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
                             from b in temp.DefaultIfEmpty()
                             select new LifePayOrderListOutput
                             {
-                                DiscountAmount = a.DiscountAmount,
+                                DiscountAmount = a.DiscountAmount ?? 0,
                                 FinishTime = a.FinishTime,
                                 Id = a.Id,
-                                LifePayOrderStatus = a.LifePayOrderStatus,
+                                LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
                                 LifePayOrderType = a.LifePayOrderType,
                                 LifePayType = a.LifePayType,
                                 OrderNo = a.OrderNo,
-                                PayAmount = a.PayAmount,
+                                PayAmount = a.PayAmount ?? 0,
                                 PhoneNumber = a.PhoneNumber,
-                                RechargeAmount = a.RechargeAmount,
+                                RechargeAmount = a.RechargeAmount ?? 0,
                                 UserId = a.UserId,
                                 OutOrderNo = a.OutOrderNo,
-                                PayStatus = a.PayStatus,
+                                PayStatus = a.PayStatus ?? 0,
                                 PayTime = a.PayTime,
                                 ACOOLYOrderNo = a.ACOOLYOrderNo,
                                 RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+                                RefundPrice = a.RefundPrice,
                                 CreationTime = a.CreationTime,
                                 RefundCheckRemark = a.RefundCheckRemark,
                                 RefundApplyRemark = a.RefundApplyRemark,
                                 RefundTime = a.RefundTime,
                                 ChannelName = b.ChannlesName,
-                                ActualRechargeAmount = a.ActualRechargeAmount,
+                                ActualRechargeAmount = a.RechargeAmount,
+                                ActualReceivedAmount = a.ActualReceivedAmount,
                                 PlatformDeductionAmount = a.PlatformDeductionAmount,
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
@@ -266,24 +299,134 @@
         return result;
     }
 
+    /// <summary>
+    /// 閫�娆捐鍗曞垎椤�
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
+    {
+
+        var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+        .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑
+        || (x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆� && x.LifePayRefundStatus != LifePayRefundStatusEnum.閫�娆鹃┏鍥�))
+                                            .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime)
+                                            .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime)
+                                            .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
+                                            .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
+                                            .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
+                                            .WhereIf(input.LifePayRefundStatus.HasValue, x => x.LifePayRefundStatus == input.LifePayRefundStatus.Value)
+                                            .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
+                                            .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
+                                            .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
+                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.RefundOrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords))
+                            join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
+                            from b in temp.DefaultIfEmpty()
+                            select new LifePayOrderListOutput
+                            {
+                                DiscountAmount = a.DiscountAmount ?? 0,
+                                FinishTime = a.FinishTime,
+                                Id = a.Id,
+                                LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
+                                LifePayOrderType = a.LifePayOrderType,
+                                LifePayType = a.LifePayType,
+                                OrderNo = a.OrderNo,
+                                PayAmount = a.PayAmount ?? 0,
+                                PhoneNumber = a.PhoneNumber,
+                                RechargeAmount = a.RechargeAmount ?? 0,
+                                UserId = a.UserId,
+                                OutOrderNo = a.OutOrderNo,
+                                PayStatus = a.PayStatus ?? 0,
+                                PayTime = a.PayTime,
+                                ACOOLYOrderNo = a.ACOOLYOrderNo,
+                                RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+                                CreationTime = a.CreationTime,
+                                RefundCheckRemark = a.RefundCheckRemark,
+                                RefundApplyRemark = a.RefundApplyRemark,
+                                RefundApplyTime = a.RefundApplyTime,
+                                RefundOrderNo = a.RefundOrderNo,
+                                RefundTime = a.RefundTime,
+                                RefundPrice = a.RefundPrice,
+                                ChannelName = b.ChannlesName,
+                                ActualRechargeAmount = a.RechargeAmount,
+                                PlatformDeductionAmount = a.PlatformDeductionAmount,
+                                ACOOLYStatus = a.ACOOLYStatus,
+                                LifePayRefundStatus = a.LifePayRefundStatus,
+                            }).GetPageResult(input.PageModel);
+
+        return result;
+    }
+
+    /// <summary>
+    /// 閫�娆捐鍗曞垎椤�
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
+    {
+        var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate
+        {
+            FinishTime = x.RefundTime,
+            RefundPrice = x.RefundPrice,
+            LifePayOrderType = x.LifePayOrderType,
+            LifePayType = x.LifePayType,
+            PayAmount = x.PayAmount,
+            PhoneNumber = x.PhoneNumber,
+            RefundOrderNo = x.RefundOrderNo,
+            RefundApplyTime = x.RefundApplyTime,
+            ChannelName = x.ChannelName,
+            CreationTime = x.CreationTime,
+            ACOOLYStatus = x.ACOOLYStatus,
+            RefundApplyRemark = x.RefundApplyRemark,
+            RechargeAmount = x.RechargeAmount,
+            ActualReceivedAmount = (x.ActualReceivedAmount ?? 0).ToString("F2"),
+            LifePayRefundStatus = x.LifePayRefundStatus,
+            OrderNo = x.OrderNo,
+
+        }).OrderByDescending(r => r.CreationTime).ToListAsync();
+        var i = 0;
+        result.ForEach(s =>
+        {
+            s.SerialNumber = ++i;
+            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
+            s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
+            s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
+            s.ActualReceivedAmount = s.ActualReceivedAmount;
+            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
+            s.PayAmountStr = s.PayAmount.ToString("F2");
+            s.LifePayTypeStr = s.LifePayType.GetDescription();
+            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);
+        });
+        return result;
+    }
+
+
     public async Task<LifePayOrderOutput> GetLifePayOrderDetail(string orderNo)
     {
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
-        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
-        var channleRate = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+        var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+        var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
+        CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "鐢ㄦ埛涓嶅瓨鍦�");
+        var orderpirce = await GetOrderPrice(order.RechargeAmount ?? 0, order.PayAmount ?? 0, order.PlatformRate ?? 0, order.ChannleRate ?? 0, order.ChannlesRakeRate ?? 0, order.PremiumRate ?? 0);
+
         var result = new LifePayOrderOutput()
-                {
-            DiscountAmount = order.DiscountAmount,
+        {
+            UserName = user.Name,
+            UserPhoneNumber = user.PhoneNumber,
+            DiscountAmount = order.DiscountAmount ?? 0,
             FinishTime = order.FinishTime,
             Id = order.Id,
-            LifePayOrderStatus = order.LifePayOrderStatus,
+            OutOrderNo = order.OutOrderNo,
+            LifePayChannle = channle.ChannlesName,
+            Status = order.LifePayOrderStatus ?? 0,
             LifePayOrderType = order.LifePayOrderType,
             LifePayType = order.LifePayType,
             OrderNo = order.OrderNo,
-            PayAmount = order.PayAmount,
-            RechargeAmount = order.RechargeAmount,
-            PayStatus = order.PayStatus,
+            PayAmount = order.PayAmount ?? 0,
+            RechargeAmount = order.RechargeAmount ?? 0,
+            PayStatus = order.PayStatus ?? 0,
             PayTime = order.PayTime,
             OrderParamDetailJsonStr = order.OrderParamDetailJsonStr,
             RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
@@ -293,14 +436,65 @@
             RefundTime = order.RefundTime,
             ACOOLYOrderNo = order.ACOOLYOrderNo,
             LifePayRefundStatus = order.LifePayRefundStatus,
-            ActualRechargeAmount = order.ActualRechargeAmount,
+            ActualRechargeAmount = order.RechargeAmount,
             RefundPrice = order.RefundPrice,
-            PlatformRate = platformRate.Rate,
+            PlatformRate = order.PlatformRate,
             PlatformPrice = order.PlatformDeductionAmount,
-            ChannleRate = channleRate.ChannlesRate,
-            ChannlesRakeRate = channleRate.ChannlesRakeRate,
-            ChannlesRakePrice = (order.PayAmount - order.PlatformDeductionAmount) * channleRate.ChannlesRakeRate,
-            //PremiumRate = 
+            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+            RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
+            ChannleRate = order.ChannleRate,
+            ChannlesRakeRate = order.ChannlesRakeRate,
+            ChannlesRakePrice = orderpirce.ChannlesRakePrice,
+            PremiumRate = order.PremiumRate,
+            PremiumPrice = orderpirce.PremiumPrice,
+            Profit = orderpirce.Profit,
+            RefundOrderNo = order.RefundOrderNo,
+        };
+
+        return result;
+    }
+
+    public async Task<LifePayRefundOrderOutput> GetLifePayRefundOrderDetail(string orderNo)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+        var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+        var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+        var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
+
+        var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
+        var result = new LifePayRefundOrderOutput()
+        {
+            UserName = user.Name,
+            UserPhoneNumber = user.PhoneNumber,
+            DiscountAmount = order.DiscountAmount ?? 0,
+            FinishTime = order.FinishTime,
+            Id = order.Id,
+            OutOrderNo = order.OutOrderNo,
+            LifePayChannle = channle.ChannlesName,
+            Status = order.LifePayOrderStatus ?? 0,
+            LifePayOrderType = order.LifePayOrderType,
+            LifePayType = order.LifePayType,
+            OrderNo = order.OrderNo,
+            PayAmount = order.PayAmount ?? 0,
+            RechargeAmount = order.RechargeAmount ?? 0,
+            PayStatus = order.PayStatus ?? 0,
+            PayTime = order.PayTime,
+            RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
+            CreationTime = order.CreationTime,
+            RefundCheckRemark = order.RefundCheckRemark,
+            RefundApplyRemark = order.RefundApplyRemark,
+            RefundApplyTime = order.RefundApplyTime,
+            RefundTime = order.RefundTime,
+            RefundOrderNo = order.RefundOrderNo,
+            ACOOLYOrderNo = order.ACOOLYOrderNo,
+            LifePayRefundStatus = order.LifePayRefundStatus,
+            ActualRechargeAmount = order.ActualRechargeAmount,
+            ActualReceivedAmount = order.ActualReceivedAmount,
+            RefundPrice = order.RefundPrice,
+            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+            RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
         };
 
         return result;
@@ -330,24 +524,27 @@
                                             .Select(x =>
                                                     new UserLifePayOrderOutput
                                                     {
-                                                        DiscountAmount = x.DiscountAmount,
+                                                        DiscountAmount = x.DiscountAmount ?? 0,
                                                         FinishTime = x.FinishTime,
                                                         Id = x.Id,
-                                                        LifePayOrderStatus = x.LifePayOrderStatus,
+                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
                                                         LifePayOrderType = x.LifePayOrderType,
                                                         LifePayType = x.LifePayType,
                                                         OrderNo = x.OrderNo,
-                                                        PayAmount = x.PayAmount,
-                                                        RechargeAmount = x.RechargeAmount,
-                                                        PayStatus = x.PayStatus,
+                                                        PayAmount = x.PayAmount ?? 0,
+                                                        RechargeAmount = x.RechargeAmount ?? 0,
+                                                        PayStatus = x.PayStatus ?? 0,
                                                         PayTime = x.PayTime,
                                                         OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
                                                         RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),
                                                         CreationTime = x.CreationTime,
                                                         RefundCheckRemark = x.RefundCheckRemark,
                                                         RefundApplyRemark = x.RefundApplyRemark,
+                                                        RefundApplyTime = x.RefundApplyTime,
                                                         RefundTime = x.RefundTime,
                                                         ACOOLYOrderNo = x.ACOOLYOrderNo,
+                                                        LifePayRefundStatus = x.LifePayRefundStatus,
+                                                        ACOOLYStatus = x.ACOOLYStatus,
                                                     })
                                             .GetPageResult(input.PageModel);
     }
@@ -358,16 +555,16 @@
                                             .Select(x =>
                                                     new UserLifePayOrderOutput
                                                     {
-                                                        DiscountAmount = x.DiscountAmount,
+                                                        DiscountAmount = x.DiscountAmount ?? 0,
                                                         FinishTime = x.FinishTime,
                                                         Id = x.Id,
-                                                        LifePayOrderStatus = x.LifePayOrderStatus,
+                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
                                                         LifePayOrderType = x.LifePayOrderType,
                                                         LifePayType = x.LifePayType,
                                                         OrderNo = x.OrderNo,
-                                                        PayAmount = x.PayAmount,
-                                                        RechargeAmount = x.RechargeAmount,
-                                                        PayStatus = x.PayStatus,
+                                                        PayAmount = x.PayAmount ?? 0,
+                                                        RechargeAmount = x.RechargeAmount ?? 0,
+                                                        PayStatus = x.PayStatus ?? 0,
                                                         PayTime = x.PayTime,
                                                         OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
                                                         RefundCredentialsImgUrl = x.RefundCredentialsImgUrl.GetOssPath(),
@@ -393,7 +590,7 @@
     public async Task<LifePayStatusEnum> GetPayStatusByOrderNo(string orderNo)
     {
         return await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo)
-                                            .Select(x => x.PayStatus)
+                                            .Select(x => x.PayStatus ?? 0)
                                             .FirstOrDefaultAsync();
     }
 
@@ -402,9 +599,9 @@
         return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
     }
 
-    public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+    public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
     {
-        return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
+        return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue, x => x.Status == input.Status).ToListAsync();
     }
 
     public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -449,7 +646,7 @@
                                                         OrderNo = x.OrderNo,
                                                         RefundCheckRemark = x.RefundCheckRemark,
                                                         RefundApplyRemark = x.RefundApplyRemark,
-                                                        LifePayOrderStatus = x.LifePayOrderStatus,
+                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
                                                     }).FirstOrDefaultAsync();
 
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
@@ -464,7 +661,7 @@
             return new PageOutput<UserAccountOutput>();
         }
 
-        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)
+        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)
                                             .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)
                                             .OrderByDescending(x => x.CreationTime)
                                             .Select(x =>
@@ -491,7 +688,7 @@
             return new List<UserAccountOutput>();
         }
 
-        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.IsDeleted == false)
+        var result = await _lifePayAccount.Where(x => x.UserId == input.UserId)
                                             .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayType == input.LifePayOrderType)
                                             .OrderByDescending(x => x.CreationTime)
                                             .Select(x =>
@@ -543,6 +740,7 @@
             LifePayType = x.LifePayType,
             OrderNo = x.OrderNo,
             PayAmount = x.PayAmount,
+            ActualRechargeAmount = x.RechargeAmount,
             PhoneNumber = x.PhoneNumber,
             RechargeAmount = x.RechargeAmount,
             OutOrderNo = x.OutOrderNo,
@@ -550,25 +748,158 @@
             PayTime = x.PayTime,
             ACOOLYOrderNo = x.ACOOLYOrderNo,
             CreationTime = x.CreationTime,
-            RefundApplyRemark = x.RefundApplyRemark,
-            ChannelName = x.ChannelName
+            LifePayRefundStatus = x.LifePayRefundStatus,
+            ACOOLYStatus = x.ACOOLYStatus,
+            //RefundApplyRemark = x.RefundApplyRemark,
+            ChannelName = x.ChannelName,
+            PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
         }).OrderByDescending(r => r.CreationTime).ToListAsync();
         var i = 0;
         result.ForEach(s =>
         {
             s.SerialNumber = ++i;
             s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
-            s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
+            s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
             s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
             s.PayAmountStr = s.PayAmount.ToString("F2");
-            s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
+            s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
             s.LifePayTypeStr = s.LifePayType.GetDescription();
             s.PayStatusStr = s.PayStatus.GetDescription();
+            s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
+            s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
+            s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
             s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
-            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
+            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
         });
         return result;
     }
+    public async Task<string> GetBillErceiptExport(string orderNo)
+    {
+        try
+        {
+            var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+
+            CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
+            if (order.LifePayType == LifePayTypeEnum.AliPay)
+            {
+                var elecInfoInput = new DataBillErceiptApplyInput
+                {
+                    Type = "FUND_DETAIL",
+                    Key = order.OutOrderNo
+                };
+
+                var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);
+                if (elecInfoOutput != null)
+                {
+                    var elecFileInput = new DataBillEreceiptQueryInput
+                    {
+                        FileId = elecInfoOutput.FileId,
+                    };
+                    var elecFileOutput = await _alipayInterfaceManager.DataBillEreceiptQuery(elecFileInput);
+                    if (!string.IsNullOrEmpty(elecFileOutput.DownloadUrl))
+                    {
+                        return elecFileOutput.DownloadUrl;
+                    }
+                    return "";
+                }
+                return "";
+            }
+            else
+            {
+                WxPayTradeBillApplyRequest req = new WxPayTradeBillApplyRequest
+                {
+                    OutBillNo = order.OutOrderNo,
+                };
+
+                var res = await _wxPayApi.WxPayTradeBillApply(req);
+                return "";
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("鑾峰彇璁㈠崟鍙蜂负{0}鐢靛瓙鍥炲崟鍑虹幇閿欒锛歿1}", orderNo, ex.Message);
+            return "";
+        }
+    }
+
+    /// <summary>
+    /// 鏌ヨ鏀粯瀹濇敮浠樿鍗曚俊鎭�
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<AlipayTradeQueryResponse> QueryAlipayTrade(OrderInQuiryInput input)
+    {
+        var result = await _aliPayApi.OrderInQuiry(input);
+
+        return result;
+    }
+
+    /// <summary>
+    /// 鏌ヨ鏀粯瀹濋��娆捐鍗曚俊鎭�
+    /// </summary>
+    /// <param name="input"></param>
+    /// <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);
+        if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
+        {
+            order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+            {
+                OrderNo = order.RefundOrderNo,
+                OutOrderNo = result.TradeNo,
+                LifePayType = LifePayTypeEnum.AliPay,
+                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+            });
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// 鏌ヨ寰俊閫�娆捐鍗曚俊鎭�
+    /// </summary>
+    /// <param name="outTradeNo"></param>
+    /// <returns></returns>
+    public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.RefundOrderNo == outTradeNo).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
+        var result = await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
+        if (order.LifePayRefundStatus != LifePayRefundStatusEnum.宸查��娆� && result.Code == WxpayResultCode.Success && result.Status == WxPayRefundStatus.閫�娆炬垚鍔�)
+        {
+            order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+            await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+            {
+                OrderNo = order.OrderNo,
+                OutRefundNo = order.RefundOrderNo,
+                OutOrderNo = order.OutOrderNo,
+                LifePayType = LifePayTypeEnum.AliPay,
+                ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+            });
+        }
+        return result;
+
+    }
+
+    /// <summary>
+    /// 鏌ヨ寰俊璁㈠崟淇℃伅
+    /// </summary>
+    /// <param name="outTradeNo"></param>
+    /// <returns></returns>
+    public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
+    {
+        return await _wxPayApi.WxPayTradeQuery(outTradeNo);
+    }
+
+
 
     #endregion
 
@@ -590,16 +921,24 @@
         var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
         CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
 
-        var rate = await GetRate();
-        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder
+        && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+        && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑
+        && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).AnyAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
 
-        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸).Rate);
+        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸);
+
+        var amount = CalculateAmount(input.ProductData.ParValue, rate);
+
+        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+
 
         var orderInput = new CreateLifePayOrderInput
         {
             OrderNo = channle.ChannlesNum + CreateOrderNo(),
-            LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
-            LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
+            LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
+            LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
             //LifePayType = input.LifePayType,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
@@ -608,7 +947,11 @@
             PayAmount = amount.PayAmont,
             DiscountAmount = amount.DiscountAmount,
             RechargeAmount = amount.RechargeAmount,
-            ChannelId = channle.ChannlesNum
+            ChannelId = channle.ChannlesNum,
+            PlatformRate = platformRate.Rate,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
+            ChannleRate = rate,
+            ChannlesRakeRate = channle.ChannlesRakeRate,
         };
 
         await CreateLifePayOrder(orderInput);
@@ -634,17 +977,21 @@
         CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
         CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
 
-        var rate = await GetRate();
-        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+         && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
+         && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).AnyAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
 
-        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸).Rate);
+
+        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸);
+        var amount = CalculateAmount(input.ProductData.ParValue, rate);
+        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
 
         var orderInput = new CreateLifePayOrderInput
         {
             OrderNo = channle.ChannlesNum + CreateOrderNo(),
-            LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
-            LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
-            // LifePayType = input.LifePayType,
+            LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
+            LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
             PayStatus = LifePayStatusEnum.鏈敮浠�,
@@ -652,7 +999,11 @@
             PayAmount = amount.PayAmont,
             DiscountAmount = amount.DiscountAmount,
             RechargeAmount = amount.RechargeAmount,
-            ChannelId = channle.ChannlesNum
+            ChannelId = channle.ChannlesNum,
+            PlatformRate = platformRate.Rate,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
+            ChannleRate = rate,
+            ChannlesRakeRate = channle.ChannlesRakeRate,
         };
 
         await CreateLifePayOrder(orderInput);
@@ -678,16 +1029,23 @@
         CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "娓犻亾涓嶅瓨鍦�");
         CheckExtensions.IfTrueThrowUserFriendlyException(channle.Status == LifePayChannelsStatsEnum.绂佺敤, "娓犻亾宸茶绂佺敤");
 
-        var rate = await GetRate();
-        CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+        var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.GasOrder && x.PayStatus == LifePayStatusEnum.宸叉敮浠�
+        && x.LifePayOrderStatus == LifePayOrderStatusEnum.鍏呭�间腑 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
+        && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).AnyAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "鎮ㄦ湁鍚屾埛鍙疯鍗曟鍦ㄥ厖鍊间腑锛岃鍕块噸澶嶅厖鍊�");
 
-        var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸).Rate);
+
+        var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸);
+
+        var amount = CalculateAmount(input.ProductData.ParValue, rate);
+
+        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
 
         var orderInput = new CreateLifePayOrderInput
         {
             OrderNo = channle.ChannlesNum + CreateOrderNo(),
-            LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
-            LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
+            LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
+            LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
             // LifePayType = input.LifePayType,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
@@ -696,7 +1054,11 @@
             PayAmount = amount.PayAmont,
             DiscountAmount = amount.DiscountAmount,
             RechargeAmount = amount.RechargeAmount,
-            ChannelId = channle.ChannlesNum
+            ChannelId = channle.ChannlesNum,
+            PlatformRate = platformRate.Rate,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
+            ChannleRate = rate,
+            ChannlesRakeRate = channle.ChannlesRakeRate,
         };
 
         await CreateLifePayOrder(orderInput);
@@ -715,81 +1077,48 @@
     /// <returns></returns>
     public async Task<string> SetLifePayOrderPayType(SetLifePayOrderPayTypeInput input, string ip)
     {
-        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
-        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
-
-        order.LifePayType = input.LifePayType;
-
-        await _lifePayOrderRepository.UpdateAsync(order);
-
-        var desc = "鐢熸椿缂磋垂-";
-        switch (order.LifePayOrderType)
-        {
-            case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
-                desc += "璇濊垂";
-                break;
-            case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
-                desc += "鐢佃垂";
-                break;
-            default:
-                break;
-        }
+        var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
 
 #if DEBUG
         //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
-        var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
+        var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
 #else
-      //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
-        var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
+      //var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, 0.01m, ip, input.H5Type);
+        var payUrl = await GetPayQRCode(res.LifePayType, res.OrderNo, res.Desc, res.PayAmount, ip, input.H5Type);
 #endif
 
         return payUrl;
     }
 
     /// <summary>
-    /// 璁剧疆鐢熸椿缂磋垂鏀粯绫诲瀷
+    /// 鑾峰彇寰俊鏀粯鐨凧SAPI
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
     public async Task<ModelPaymentMiniPay> GetPayOrderForJsAPI(GetPayOrderForJsAPIInput input, string ip)
     {
-        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OrderNo).FirstOrDefaultAsync();
+        var res = await SetPayType(input.OrderNo, input.LifePayType, ip);
+        var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, res.PayAmount, input.OrderNo, res.Desc);
+        return result;
+    }
+
+    /// <summary>
+    /// 淇敼瀹為檯鍒拌处閲戦
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<int> UpdateLifePayOrderActualReceivedAmount(UpdateLifePayOrderInput input)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.Id == input.Id).FirstOrDefaultAsync();
+
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+        CheckExtensions.IfTrueThrowUserFriendlyException(order.ACOOLYStatus != ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�, "璇ヨ鍗曟棤娉曚慨鏀瑰埌璐﹂噾棰�");
 
-        CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
-
-        order.LifePayType = input.LifePayType;
+        order.ActualReceivedAmount = input.ActualReceivedAmount;
         await _lifePayOrderRepository.UpdateAsync(order);
 
-        var desc = "鐢熸椿缂磋垂-";
-        switch (order.LifePayOrderType)
-        {
-            case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
-                desc += "璇濊垂";
-                break;
-            case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
-                desc += "鐢佃垂";
-                break;
-            case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
-                desc += "鐕冩皵";
-                break;
-            default:
-                break;
-        }
-
-
-        //var result = await PayTransactionsJsAPI(input.OpenId, input.Attach, 0.01m, input.OrderNo, desc);
-        //return result;
-
-        //  var result = await PayTransactionsJsAPI(input.OpenId, input.Attach,  order.PayAmount, input.OrderNo, desc);
-
-        var result = await PayTransactionsJsAPI(input.OpenId, input.PayAppId, input.Attach, order.PayAmount, input.OrderNo, desc);
-        return result;
-        //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, ip, input.H5Type);
-        //var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, order.PayAmount, ip, input.H5Type);
-
+        return Constant.SUCCESS;
     }
 
     /// <summary>
@@ -799,8 +1128,6 @@
     /// <returns></returns>
     public async Task CreateLifePayOrder(CreateLifePayOrderInput input)
     {
-        CheckExtensions.IfTrueThrowUserFriendlyException(input.RechargeAmount < 0.01m || input.PayAmount < 0.01m || input.DiscountAmount < 0, "璁㈠崟閲戦閿欒");
-
         var entity = ObjectMapper.Map<CreateLifePayOrderInput, LifePayOrder>(input);
         await _lifePayOrderRepository.InsertAsync(entity);
     }
@@ -828,7 +1155,7 @@
 #endif
 
         CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
-                                                        "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+                                                        result.Message);
 
         return (result.Code, requestInput.RequestNo, result.PhoneChargeOrder.BusiOrderNo);
     }
@@ -852,14 +1179,10 @@
             OutOrderNo = orderNo
         };
         var result = await _aCOOLYManager.ConfirmElectricOrder(requestInput);
-#if DEBUG
-
         _logger.LogInformation($"CreateACOOLYElectricOrder:{JsonConvert.SerializeObject(result)}");
 
-#endif
-
         CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
-                                                        "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+                                                        result.Message);
 
         return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);
     }
@@ -887,7 +1210,7 @@
 #endif
 
         CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
-                                                        "璋冪敤ACOOLY鎺ュ彛ConfirmElectricOrder杩斿洖閿欒:" + JsonConvert.SerializeObject(result));
+                                                        result.Message);
 
         return (result.Code, requestInput.RequestNo, result.GasChargeOrder.BusiOrderNo);
     }
@@ -919,10 +1242,12 @@
                 OpenId = openid
             }
         };
+        Logger.LogError("璋冪敤璇锋眰锛�" + req.ToJson());
         var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
         string nonce = Guid.NewGuid().ToString();
 
         var res = await _wxPayApi.PayTransactionsJsAPI(req);
+        Logger.LogError("璋冪敤缁撴灉锛�" + res.ToJson());
         string package = "prepay_id=" + res.PrepayId;
         ModelPaymentMiniPay info = new ModelPaymentMiniPay();
         if (res != null)
@@ -974,38 +1299,68 @@
         order.PayStatus = LifePayStatusEnum.宸叉敮浠�;
         order.PayTime = DateTime.Now;
         order.OutOrderNo = outOrderNo;
+
         try
         {
             var result = (Code: "Fail", RequestNo: "", ACOOLYOrderNo: "");
             switch (order.LifePayOrderType)
             {
-                case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
+                case LifePayOrderTypeEnum.PhoneOrder:
                     result = await CreateACOOLYPhoneOrder(JsonConvert.DeserializeObject<LifePhoneData>(order.OrderParamDetailJsonStr), order.OrderNo);
                     break;
-                case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
+                case LifePayOrderTypeEnum.ElectricOrder:
                     result = await CreateACOOLYElectricOrder(JsonConvert.DeserializeObject<LifeElectricData>(order.OrderParamDetailJsonStr), order.OrderNo);
                     break;
-                case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+                case LifePayOrderTypeEnum.GasOrder:
                     result = await CreateACOOLYGasOrder(JsonConvert.DeserializeObject<LifeGasData>(order.OrderParamDetailJsonStr), order.OrderNo);
                     break;
                 default:
                     break;
             }
 
-            order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�;
+            order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
             //SetOrderStatus(order, result.Code);
             order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
-            order.ACOOLYOrderNo = result.ACOOLYOrderNo.IsNullOrEmpty() ? null : result.ACOOLYOrderNo;
+            order.ACOOLYOrderNo = result.ACOOLYOrderNo;
+            order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
+
+            /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+            await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
+                                order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
-            order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插け璐�;
-            order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+            order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+            order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+            order.RefundApplyRemark = ex.Message;
         }
+
         _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
         await _lifePayOrderRepository.UpdateAsync(order);
     }
+
+    public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+        order.LifePayRefundStatus = refundStatus;
+        switch (refundStatus)
+        {
+            case LifePayRefundStatusEnum.宸查��娆�:
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+                break;
+            case LifePayRefundStatusEnum.閫�娆句腑:
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+                break;
+            default: break;
+        }
+    }
+
 
     /// <summary>
     /// ACOOLYO璁㈠崟閫氱煡澶勭悊
@@ -1013,7 +1368,7 @@
     /// <param name="orderNo"></param>
     /// <param name="outOrderNo"></param>
     /// <returns></returns>
-    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount)
+    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark, decimal? parValue = 0, decimal? actualParValue = 0)
     {
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1023,25 +1378,53 @@
             return;
         }
 
-        order.LifePayOrderStatus = status;
-        order.ACOOLYStatus = acoolyStatus;
-        order.PlatformDeductionAmount = payAmount;
+        // order.PlatformDeductionAmount = payAmount;
+
         if (acoolyOrderNo.IsNotNullOrEmpty())
         {
             order.ACOOLYOrderNo = acoolyOrderNo;
         }
 
+        if (status == LifePayOrderStatusEnum.寰呴��娆�)
+        {
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+        }
+
+        if (refundApplyRemark.IsNotNullOrEmpty())
+        {
+            order.RefundApplyRemark = refundApplyRemark;
+        }
+
+        order.LifePayOrderStatus = status;
+        order.ACOOLYStatus = acoolyStatus;
+        order.FinishTime = DateTime.Now;
+        await _lifePayOrderRepository.UpdateAsync(order);
+
         if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
         {
-            order.FinishTime = DateTime.Now;
+            ///缁撶畻娓犻亾浣ｉ噾
+            /// 姣涘埄
+            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.RechargeAmount ?? 0,
+                    ChannlesRakeRate = order.ChannlesRakeRate ?? 0,
+                    ChannlesRakePrice = channlesRakePrice ?? 0,
+                    FinishTime = order.FinishTime.Value,
+                    ChannelId = order.ChannelId,
+                };
+                await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
+            }
         }
 
-        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.宸查��娆�)
-        {
-            order.PayStatus = LifePayStatusEnum.寰呴��娆�;
-        }
-
-        await _lifePayOrderRepository.UpdateAsync(order);
+        /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+        await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
+                    order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue);
     }
 
     /// <summary>
@@ -1055,45 +1438,64 @@
         var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
         {
             return;
         }
 
-        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳)
+        if (input.RefundPrice > order.PayAmount)
+        {
+            throw new UserFriendlyException("閫�娆剧殑閲戦涓嶈兘澶т簬瀹炰粯閲戦");
+        }
+
+        if (input.LifePayRefundType == LifePayRefundTypeEnum.鍏ㄩ閫�娆�)
+        {
+            input.RefundPrice = order.PayAmount ?? 0;
+        }
+
+        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� || order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayRefundStatus != LifePayRefundStatusEnum.寰呴��娆�)
         {
             throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
         }
 
+        var outRefundNo = order.ChannelId + CreateRefundOrderNo();
         switch (order.LifePayType)
         {
             case LifePayTypeEnum.WxPay:
-                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
-                if (wxRefundResult.Status == "SUCCESS")
+                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo, order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 100), Convert.ToInt32(order.PayAmount * 100));
+                if (wxRefundResult.Status == WxpayRefundResultStatus.SUCCESS)
                 {
-                    order.PayStatus = LifePayStatusEnum.宸查��娆�;
-                    order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                }
-                else if (wxRefundResult.Status == "PROCESSING")
-                {
-                    order.PayStatus = LifePayStatusEnum.閫�娆句腑;
+                    order.RefundOrderNo = outRefundNo;
                     order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+                }
+                else if (wxRefundResult.Status == WxpayRefundResultStatus.PROCESSING)
+                {
+                    order.RefundOrderNo = outRefundNo;
+                    order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+                }
+                else if (wxRefundResult.Status.IsNullOrEmpty() && wxRefundResult.Message == WxpayRefundResultMessage.FullRefund)
+                {
+                    order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+                    order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
                 }
                 else
                 {
-                    throw new UserFriendlyException("閫�娆惧け璐�");
+                    throw new UserFriendlyException("閫�娆惧け璐�:" + wxRefundResult.Message);
                 }
 
                 break;
             case LifePayTypeEnum.AliPay:
-                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = order.PayAmount.ToString() });
+                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
                 if (aliRefundResult.Code != AlipayResultCode.Success)
                 {
-                    throw new UserFriendlyException("閫�娆惧け璐�");
+                    throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
                 }
 
-                order.PayStatus = LifePayStatusEnum.宸查��娆�;
-                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+                order.RefundOrderNo = outRefundNo;
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 break;
             default: throw new UserFriendlyException("閫�娆惧け璐�");
         }
@@ -1102,13 +1504,13 @@
         order.RefundCheckRemark = input.RefundCheckRemark;
         order.RefundTime = DateTime.Now;
         order.RefundCheckUserId = CurrentUser.Id;
-        order.RefundPrice = order.PayAmount;
+        order.RefundPrice = input.RefundPrice;
 
-        await _lifePayOrderRepository.UpdateAsync(order);
+        //await _lifePayOrderRepository.UpdateAsync(order);
 
         #region 璁板綍鏃ュ織
 
-        await PublishLifePayOrderHistoryEvent("閫�娆�", "閫�娆�", order.Id);
+        await LifePayOrderHistory("閫�娆�", "閫�娆�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
 
         #endregion
 
@@ -1129,22 +1531,30 @@
             throw new UserFriendlyException("闈炵敤鎴锋湰浜洪��娆�");
         }
 
-        if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
         {
             return;
         }
 
-        if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呯‘璁� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐�
-            && order.PayStatus != LifePayStatusEnum.宸叉敮浠�)
+        if (order.PayStatus == LifePayStatusEnum.宸叉敮浠� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插畬鎴�
+            && order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸查��娆�)
+        {
+            order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+            order.RefundApplyRemark = input.RefundApplyRemark;
+            order.RefundApplyTime = DateTime.Now;
+            await _lifePayOrderRepository.UpdateAsync(order);
+        }
+        else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆� ||
+            order.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑 || order.LifePayRefundStatus == LifePayRefundStatusEnum.閫�娆句腑 ||
+            order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
+        {
+            throw new UserFriendlyException("褰撳墠璁㈠崟鏃犳硶閲嶅鐢宠閫�娆�");
+        }
+        else
         {
             throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曠敵璇烽��娆�");
         }
-
-        order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳;
-        order.RefundApplyRemark = input.RefundApplyRemark;
-        order.RefundApplyTime = DateTime.Now;
-
-        await _lifePayOrderRepository.UpdateAsync(order);
     }
 
     /// <summary>
@@ -1156,13 +1566,13 @@
     /// <param name="total"></param>
     /// <param name="currency"></param>
     /// <returns></returns>
-    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
+    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string outRefundNo, string reason, int refund, int total, string currency = "CNY")
     {
         WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
         {
             OutTradeNo = outTradeNo,
-            OutRefundNo = CreateRefundOrderNo(),
-            Reason = reason,
+            OutRefundNo = outRefundNo,
+            //Reason = reason,
             Amount = new Model_WxPayDomesticRefunds_Amount
             {
                 Refund = refund,
@@ -1192,8 +1602,8 @@
                                             .FirstOrDefaultAsync();
             CheckExtensions.IfTrueThrowUserFriendlyException(userAccount == null, "鎴峰彿涓嶅瓨鍦�");
             var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id)
-                                            .FirstOrDefaultAsync();
-            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+                                            .AnyAsync();
+            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "鎴峰彿宸插瓨鍦�");
 
             userAccount.LifePayType = input.LifePayType;
             userAccount.Content = input.Content;
@@ -1205,9 +1615,9 @@
         }
         else
         {
-            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
-                                            .FirstOrDefaultAsync();
-            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "鎴峰彿宸插瓨鍦�");
+            var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
+                                            .AnyAsync();
+            CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent, "鎴峰彿宸插瓨鍦�");
             var userAccount = new LifePayAccount
             {
                 Id = Guid.NewGuid(),
@@ -1223,10 +1633,10 @@
             await _lifePayAccount.InsertAsync(userAccount);
         }
 
-        if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)
+        if (input.LifePayType == LifePayOrderTypeEnum.PhoneOrder || input.LifePayType == LifePayOrderTypeEnum.ElectricOrder)
         {
             var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
-            if (!string.IsNullOrEmpty(extraProperties.Name))
+            if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
             {
                 user.Name = extraProperties.Name;
             }
@@ -1249,6 +1659,7 @@
         userAccount.DeleterId = userAccount.UserId;
         userAccount.DeletionTime = DateTime.Now;
         userAccount.IsDeleted = true;
+
         return Constant.SUCCESS;
     }
 
@@ -1263,24 +1674,26 @@
         var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+        if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
         {
             return;
         }
 
-        if ((order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.PayStatus == LifePayStatusEnum.寰呴��娆�) ||
-            order.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳 || order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呯‘璁�)
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆�)
         {
-            order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+            if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+            {
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
+            }
+
             order.RefundCheckRemark = input.RefundCheckRemark;
             order.RefundCheckUserId = CurrentUser.Id;
+            order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆鹃┏鍥�;
 
             await _lifePayOrderRepository.UpdateAsync(order);
 
             #region 璁板綍鏃ュ織
-
-            await PublishLifePayOrderHistoryEvent("閫�娆鹃┏鍥�", "閫�娆�", order.Id);
-
+            await LifePayOrderHistory("閫�娆鹃┏鍥�", "閫�娆鹃┏鍥�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
             #endregion
         }
         else
@@ -1306,7 +1719,7 @@
             dto.Status = input.Status;
             #region 璁板綍鏃ュ織
 
-            await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
+            await LifePayOrderHistory("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
 
             #endregion
         }
@@ -1319,7 +1732,7 @@
 
             #region 璁板綍鏃ュ織
 
-            await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
+            await LifePayOrderHistory("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
 
             #endregion
         }
@@ -1336,8 +1749,7 @@
 
         #region 璁板綍鏃ュ織
 
-        await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
-
+        await LifePayOrderHistory("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
         #endregion
     }
 
@@ -1450,15 +1862,21 @@
 
     private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
     {
-        /// 姝ｅ父鏀粯
-        //var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+        if (_initSettingOptions.OpenTheOnePennyTest)
+        {
+            /// 1鍒嗛挶鏀粯
+            decimal payAmount = 0.01m;
 
-        /// 1鍒嗛挶鏀粯
-        decimal payAmount = 0.01m;
+            CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
 
-        CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
-
-        return (payAmount, amount - payAmount, amount);
+            return (payAmount, amount - payAmount, amount);
+        }
+        else
+        {
+            /// 姝ｅ父鏀粯
+            var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+            return (payAmount, amount - payAmount, amount);
+        }
     }
 
     private void SetOrderStatus(LifePayOrder order, string code)
@@ -1470,7 +1888,7 @@
                 order.FinishTime = DateTime.Now;
                 break;
             case ACOOLYConstant.Code.PROCESSING:
-                order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
                 break;
             default:
                 break;
@@ -1494,6 +1912,20 @@
         };
 
         await _distributedEventBus.PublishAsync(recordEto, false);
+    }
+
+    private async Task LifePayOrderHistory(string operateContent, string operateName, Guid relationId, int? tableType = (int)OperateHistoryTypeEnum.LifePayRefund)
+    {
+        var operateHistory = new OperateHistory
+        {
+            CreatorName = CurrentUser.Name,
+            OperateContent = operateName,
+            OperateName = operateName,
+            RelationId = relationId,
+            TableType = tableType
+
+        };
+        await _operateHistory.InsertAsync(operateHistory);
     }
 
     /// <summary>
@@ -1642,48 +2074,109 @@
         return message;
     }
 
-
     private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
     {
-        var result = (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
-                                            .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
+        var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
+        var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+                            .Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
+                      .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
                                             .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
                                             .WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
+                                            .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
                                             .WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
                                             .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
                                             .WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value)
+                                            .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
                                             .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
                                             .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
-                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
+                                            .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords) || channles.Contains(x.ChannelId))
                       join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
                       from b in temp.DefaultIfEmpty()
                       select new LifePayOrderListOutput
                       {
-                          DiscountAmount = a.DiscountAmount,
+                          DiscountAmount = a.DiscountAmount ?? 0,
                           FinishTime = a.FinishTime,
                           Id = a.Id,
-                          LifePayOrderStatus = a.LifePayOrderStatus,
+                          LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
                           LifePayOrderType = a.LifePayOrderType,
                           LifePayType = a.LifePayType,
                           OrderNo = a.OrderNo,
-                          PayAmount = a.PayAmount,
+                          PayAmount = a.PayAmount ?? 0,
                           PhoneNumber = a.PhoneNumber,
-                          RechargeAmount = a.RechargeAmount,
+                          RechargeAmount = a.RechargeAmount ?? 0,
                           UserId = a.UserId,
                           OutOrderNo = a.OutOrderNo,
-                          PayStatus = a.PayStatus,
+                          PayStatus = a.PayStatus ?? 0,
+                          PayTime = a.PayTime,
+                          ACOOLYOrderNo = a.ACOOLYOrderNo,
+                          RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+                          RefundPrice = a.RefundPrice,
+                          CreationTime = a.CreationTime,
+                          RefundCheckRemark = a.RefundCheckRemark,
+                          RefundApplyRemark = a.RefundApplyRemark,
+                          RefundTime = a.RefundTime,
+                          ChannelName = b.ChannlesName,
+                          ActualRechargeAmount = a.ActualRechargeAmount,
+                          PlatformDeductionAmount = a.PlatformDeductionAmount,
+                          ACOOLYStatus = a.ACOOLYStatus,
+                          LifePayRefundStatus = a.LifePayRefundStatus,
+                      });
+
+
+        return result;
+    }
+
+    private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayRefundOrderListFilter(QueryLifePayRefundOrderListInput input)
+    {
+        var result = (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+     .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑
+     || (x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆� && x.LifePayRefundStatus != LifePayRefundStatusEnum.閫�娆鹃┏鍥�))
+                                         .WhereIf(input.BeginRefundTime.HasValue, x => x.RefundTime >= input.BeginRefundTime)
+                                         .WhereIf(input.EndRefundTime.HasValue, x => x.RefundTime <= input.EndRefundTime)
+                                         .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
+                                         .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
+                                         .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
+                                         .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
+                                         .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
+                                         .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
+                                         .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
+                                         .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
+                      join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
+                      from b in temp.DefaultIfEmpty()
+                      select new LifePayOrderListOutput
+                      {
+                          DiscountAmount = a.DiscountAmount ?? 0,
+                          FinishTime = a.FinishTime,
+                          Id = a.Id,
+                          LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
+                          LifePayOrderType = a.LifePayOrderType,
+                          LifePayType = a.LifePayType,
+                          OrderNo = a.OrderNo,
+                          PayAmount = a.PayAmount ?? 0,
+                          PhoneNumber = a.PhoneNumber,
+                          RechargeAmount = a.RechargeAmount ?? 0,
+                          UserId = a.UserId,
+                          OutOrderNo = a.OutOrderNo,
+                          PayStatus = a.PayStatus ?? 0,
                           PayTime = a.PayTime,
                           ACOOLYOrderNo = a.ACOOLYOrderNo,
                           RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
                           CreationTime = a.CreationTime,
                           RefundCheckRemark = a.RefundCheckRemark,
                           RefundApplyRemark = a.RefundApplyRemark,
+                          RefundApplyTime = a.RefundApplyTime,
                           RefundTime = a.RefundTime,
-                          ChannelName = b.ChannlesName
+                          RefundOrderNo = a.RefundOrderNo,
+                          RefundPrice = a.RefundPrice,
+                          ChannelName = b.ChannlesName,
+                          ActualRechargeAmount = a.ActualRechargeAmount,
+                          PlatformDeductionAmount = a.PlatformDeductionAmount,
+                          ACOOLYStatus = a.ACOOLYStatus,
+                          LifePayRefundStatus = a.LifePayRefundStatus,
+                          ActualReceivedAmount = a.ActualReceivedAmount.HasValue ? a.ActualReceivedAmount.Value : 0
                       });
         return result;
     }
-
     private IQueryable<CreateEditPayChannelsInput> GetLifePayChannlesListFilter()
     {
         return _lifePayChannlesRep.Select(x =>
@@ -1700,5 +2193,84 @@
                     });
     }
 
+    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,
+        decimal channlesRakeRate, decimal premiumRate)
+    {
+        /// 姣涘埄
+        var grossProfit = price * (channleRate - platformRate) / 100;
+
+        /// 骞冲彴鎵ｆ閲戦  鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥
+        var platformPrice = price * platformRate / 100;
+
+        /// 鎵嬬画璐�
+        var premiumPrice = priceAmount * (premiumRate) / 100;
+
+        /// 娓犻亾浣ｉ噾  锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
+        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;
+
+        /// 鍒╂鼎
+        var profit = grossProfit - channlesRakePrice - premiumPrice;
+
+        return new OrderPriceReturn()
+        {
+            PlatformPrice = platformPrice,
+            PremiumPrice = premiumPrice,
+            ChannlesRakePrice = channlesRakePrice,
+            Profit = profit
+        };
+    }
+
+    public async Task<decimal> GetLifePayRate(CreateEditPayChannelsInput channel, LifePayRateTypeEnum lifePayRateType)
+    {
+        if (channel == null)
+        {
+            var rate = await GetRate();
+            CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "鏈厤缃姌鎵�");
+            var result = rate.FirstOrDefault(x => x.RateType == lifePayRateType).Rate;
+            return result;
+        }
+        else
+        {
+            return channel.ChannlesRate;
+        }
+    }
+
+    public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)
+    {
+        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+
+        CheckExtensions.IfTrueThrowUserFriendlyException(order.LifePayType.HasValue, "褰撳墠璁㈠崟宸查�夋嫨鏀粯绫诲瀷");
+
+        order.LifePayType = lifePayType;
+        var premium = await _lifePayPremiumRepository.Where(x => x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+        order.PremiumRate = premium == null ? 0 : premium.Rate;
+        await _lifePayOrderRepository.UpdateAsync(order);
+
+        var desc = "鐢熸椿缂磋垂-";
+        switch (order.LifePayOrderType)
+        {
+            case LifePayOrderTypeEnum.PhoneOrder:
+                desc += "璇濊垂";
+                break;
+            case LifePayOrderTypeEnum.ElectricOrder:
+                desc += "鐢佃垂";
+                break;
+            case LifePayOrderTypeEnum.GasOrder:
+                desc += "鐕冩皵";
+                break;
+            default:
+                break;
+        }
+
+        return new SetPayTypeReturn()
+        {
+            Desc = desc,
+            OrderNo = order.OrderNo,
+            PayAmount = order.PayAmount.HasValue ? order.PayAmount.Value : 0,
+            LifePayType = lifePayType,
+        };
+    }
+
     #endregion
 }

--
Gitblit v1.9.1