From 6739e98662c16571da7aec0e9b52fab0afd3833b Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 13 六月 2025 14:07:28 +0800
Subject: [PATCH] fix:修订支付回调和供应商回调并发问题

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |  914 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 620 insertions(+), 294 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 8b109ae..258cc91 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;
@@ -7,27 +8,23 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Data;
+using Volo.Abp.DistributedLocking;
 using Volo.Abp.Domain.Repositories;
 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;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.ObjectMapping;
-using NPOI.SS.Formula.Functions;
-using StackExchange.Redis;
-using static Volo.Abp.Identity.Settings.IdentitySettingNames;
+using static LifePayment.Domain.Shared.LifePaymentConstant;
 
 namespace LifePayment.Application;
 
@@ -45,54 +42,68 @@
     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 IAbpDistributedLock distributedLock;
     private readonly IAliPayApi _aliPayApi;
     private readonly IAlipayInterfaceManager _alipayInterfaceManager;
     private readonly IWxPayApi _wxPayApi;
     private readonly WxPayOption _wxPayOptions;
+    private readonly InitSetting _initSettingOptions;
 
     private readonly IACOOLYManager _aCOOLYManager;
+    private readonly IRepository<LifePayPromoter, Guid> lifePayPromoterRepository;
 
     public LifePayService(IDistributedEventBus distributedEventBus,
                           ILogger<LifePayService> logger,
                           IACOOLYManager aCOOLYManager,
+                          IRepository<LifePayPromoter, Guid> lifePayPromoterRepository,
                           IRepository<LifePayRate, Guid> lifePayRateRepository,
                           IRepository<LifePayOrder, Guid> lifePayOrderRepository,
                           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,
-                          IChannelFilter channelFilter)
+                          IChannelFilter channelFilter,
+                          IAbpDistributedLock distributedLock)
     {
         _logger = logger;
         _aCOOLYManager = aCOOLYManager;
+        this.lifePayPromoterRepository = lifePayPromoterRepository;
         _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;
+        this.distributedLock = distributedLock;
         _operateHistory = operateHistory;
     }
 
     #region 鏌ヨ
-
 
     /// <summary>
     /// 鑾峰彇鐢佃垂闈㈠��
@@ -124,6 +135,16 @@
     }
 
     /// <summary>
+    /// 璇濊垂璁㈠崟鏌ヨ
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input)
+    {
+        return await _aCOOLYManager.QueryPhoneOrder(input);
+    }
+
+    /// <summary>
     /// 鑾峰彇璇濊垂闈㈠��
     /// </summary>
     /// <param name="input"></param>
@@ -148,7 +169,7 @@
     /// <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();
     }
 
@@ -158,7 +179,7 @@
     /// <returns></returns>
     public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
     {
-        return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
+        return _lifePayChannlesRep.Where(x => x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
                                            .FirstOrDefault();
     }
 
@@ -168,7 +189,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();
     }
 
@@ -178,7 +199,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();
     }
@@ -190,10 +211,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.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()
                                                    {
@@ -263,19 +286,19 @@
                             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(),
@@ -286,11 +309,45 @@
                                 RefundTime = a.RefundTime,
                                 ChannelName = b.ChannlesName,
                                 ActualRechargeAmount = a.RechargeAmount,
+                                ActualReceivedAmount = a.ActualReceivedAmount,
                                 PlatformDeductionAmount = a.PlatformDeductionAmount,
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
+                                OrderParamDetailJsonStr = a.OrderParamDetailJsonStr,
                             }).GetPageResult(input.PageModel);
-
+        if (result != null && result.Data != null && result.Data.Count > 0)
+        {
+            foreach (var s in result.Data)
+            {
+                if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+                {
+                    if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+                    {
+                        var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+                        if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+                        {
+                            s.Operator = @enum.GetDescription();
+                        }
+                    }
+                    else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+                    {
+                        var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+                        if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+                        {
+                            s.Operator = @enum.GetDescription();
+                        }
+                    }
+                    else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+                    {
+                        var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+                        if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+                        {
+                            s.Operator = @enum.GetDescription();
+                        }
+                    }
+                }
+            }
+        }
         return result;
     }
 
@@ -314,24 +371,24 @@
                                             .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.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,
+                                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(),
@@ -344,6 +401,7 @@
                                 RefundPrice = a.RefundPrice,
                                 ChannelName = b.ChannlesName,
                                 ActualRechargeAmount = a.RechargeAmount,
+                                ActualReceivedAmount = a.ActualReceivedAmount,
                                 PlatformDeductionAmount = a.PlatformDeductionAmount,
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
@@ -374,8 +432,9 @@
             ACOOLYStatus = x.ACOOLYStatus,
             RefundApplyRemark = x.RefundApplyRemark,
             RechargeAmount = x.RechargeAmount,
-            ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),
+            ActualReceivedAmount = (x.ActualReceivedAmount ?? 0).ToString("F2"),
             LifePayRefundStatus = x.LifePayRefundStatus,
+            OrderNo = x.OrderNo,
 
         }).OrderByDescending(r => r.CreationTime).ToListAsync();
         var i = 0;
@@ -392,6 +451,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;
     }
 
@@ -402,26 +462,25 @@
         var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
         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 orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount, order.PlatformRate, order.ChannleRate, order.ChannlesRakeRate, order.PremiumRate);
-
+        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()
         {
             UserName = user.Name,
             UserPhoneNumber = user.PhoneNumber,
-            DiscountAmount = order.DiscountAmount,
+            DiscountAmount = order.DiscountAmount ?? 0,
             FinishTime = order.FinishTime,
             Id = order.Id,
             OutOrderNo = order.OutOrderNo,
             LifePayChannle = channle.ChannlesName,
-            Status = order.LifePayOrderStatus,
+            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(),
@@ -442,7 +501,9 @@
             ChannlesRakePrice = orderpirce.ChannlesRakePrice,
             PremiumRate = order.PremiumRate,
             PremiumPrice = orderpirce.PremiumPrice,
-            Profit = orderpirce.Profit
+            Profit = orderpirce.Profit,
+            RefundOrderNo = order.RefundOrderNo,
+            ActualReceivedAmount = order.ActualReceivedAmount
         };
 
         return result;
@@ -453,7 +514,7 @@
         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.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+        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);
 
@@ -462,18 +523,18 @@
         {
             UserName = user.Name,
             UserPhoneNumber = user.PhoneNumber,
-            DiscountAmount = order.DiscountAmount,
+            DiscountAmount = order.DiscountAmount ?? 0,
             FinishTime = order.FinishTime,
             Id = order.Id,
             OutOrderNo = order.OutOrderNo,
             LifePayChannle = channle.ChannlesName,
-            Status = order.LifePayOrderStatus,
+            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,
             RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
             CreationTime = order.CreationTime,
@@ -518,16 +579,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(),
@@ -549,16 +610,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(),
@@ -584,7 +645,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();
     }
 
@@ -593,9 +654,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)
@@ -640,7 +701,7 @@
                                                         OrderNo = x.OrderNo,
                                                         RefundCheckRemark = x.RefundCheckRemark,
                                                         RefundApplyRemark = x.RefundApplyRemark,
-                                                        LifePayOrderStatus = x.LifePayOrderStatus,
+                                                        LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
                                                     }).FirstOrDefaultAsync();
 
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
@@ -655,7 +716,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 =>
@@ -682,7 +743,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 =>
@@ -729,7 +790,7 @@
         {
             DiscountAmount = x.DiscountAmount,
             FinishTime = x.FinishTime,
-            //LifePayOrderStatus = x.LifePayOrderStatus,
+            LifePayOrderStatus = x.LifePayOrderStatus,
             LifePayOrderType = x.LifePayOrderType,
             LifePayType = x.LifePayType,
             OrderNo = x.OrderNo,
@@ -746,7 +807,8 @@
             ACOOLYStatus = x.ACOOLYStatus,
             //RefundApplyRemark = x.RefundApplyRemark,
             ChannelName = x.ChannelName,
-            PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
+            PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m,
+            OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
         }).OrderByDescending(r => r.CreationTime).ToListAsync();
         var i = 0;
         result.ForEach(s =>
@@ -762,11 +824,114 @@
             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.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
             s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
+            if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+            {
+                if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+                    if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+                else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+                    if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+                else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+                    if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+            }
         });
+        CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
         return result;
     }
+
+    public async Task<List<LifePayOrderListTemplateForChannle>> GetLifePayOrderPageExportForChannle(QueryLifePayOrderListInput input)
+    {
+        var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplateForChannle
+        {
+            DiscountAmount = x.DiscountAmount,
+            FinishTime = x.FinishTime,
+            LifePayOrderStatus = x.LifePayOrderStatus,
+            LifePayOrderType = x.LifePayOrderType,
+            LifePayType = x.LifePayType,
+            OrderNo = x.OrderNo,
+            PayAmount = x.PayAmount,
+            ActualRechargeAmount = x.RechargeAmount,
+            PhoneNumber = x.PhoneNumber,
+            RechargeAmount = x.RechargeAmount,
+            OutOrderNo = x.OutOrderNo,
+            PayStatus = x.PayStatus,
+            PayTime = x.PayTime,
+            ACOOLYOrderNo = x.ACOOLYOrderNo,
+            CreationTime = x.CreationTime,
+            LifePayRefundStatus = x.LifePayRefundStatus,
+            ACOOLYStatus = x.ACOOLYStatus,
+            //RefundApplyRemark = x.RefundApplyRemark,
+            ChannelName = x.ChannelName,
+            PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m,
+            OrderParamDetailJsonStr = x.OrderParamDetailJsonStr,
+        }).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.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.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.yyyyMMddHHmmss);
+            if (!string.IsNullOrWhiteSpace(s.OrderParamDetailJsonStr))
+            {
+                if (s.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifePhoneData>()?.IspCode;
+                    if (Enum.TryParse<IspCodeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+                else if (s.LifePayOrderType == LifePayOrderTypeEnum.ElectricOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifeElectricData>()?.ElectricType;
+                    if (Enum.TryParse<ElectricTypeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+                else if (s.LifePayOrderType == LifePayOrderTypeEnum.GasOrder)
+                {
+                    var name = s.OrderParamDetailJsonStr.JsonToObject<LifeGasData>()?.GasOrgType;
+                    if (Enum.TryParse<GasOrgCodeEnum>(name, true, out var @enum))
+                    {
+                        s.Operator = @enum.GetDescription();
+                    }
+                }
+            }
+        });
+        CheckExtensions.IfTrueThrowUserFriendlyException(result.IsNullOrEmpty(), "鏆傛棤鏁版嵁瀵煎嚭");
+        return result;
+    }
+
     public async Task<string> GetBillErceiptExport(string orderNo)
     {
         try
@@ -815,6 +980,86 @@
             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
 
     #region 鎿嶄綔
@@ -835,8 +1080,11 @@
         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 rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸);
 
@@ -844,12 +1092,11 @@
 
         var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
 
-
         var orderInput = new CreateLifePayOrderInput
         {
             OrderNo = channle.ChannlesNum + CreateOrderNo(),
             LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
-            LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
+            LifePayOrderType = LifePayOrderTypeEnum.PhoneOrder,
             //LifePayType = input.LifePayType,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
@@ -860,10 +1107,9 @@
             RechargeAmount = amount.RechargeAmount,
             ChannelId = channle.ChannlesNum,
             PlatformRate = platformRate.Rate,
-            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
             ChannleRate = rate,
             ChannlesRakeRate = channle.ChannlesRakeRate,
-            //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
         };
 
         await CreateLifePayOrder(orderInput);
@@ -889,22 +1135,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 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,
+            LifePayOrderType = LifePayOrderTypeEnum.ElectricOrder,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
             PayStatus = LifePayStatusEnum.鏈敮浠�,
@@ -914,6 +1159,7 @@
             RechargeAmount = amount.RechargeAmount,
             ChannelId = channle.ChannlesNum,
             PlatformRate = platformRate.Rate,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
             ChannleRate = rate,
             ChannlesRakeRate = channle.ChannlesRakeRate,
         };
@@ -941,8 +1187,10 @@
         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 rate = await GetLifePayRate(channle, LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸);
@@ -955,7 +1203,7 @@
         {
             OrderNo = channle.ChannlesNum + CreateOrderNo(),
             LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
-            LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
+            LifePayOrderType = LifePayOrderTypeEnum.GasOrder,
             // LifePayType = input.LifePayType,
             OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
             UserId = user.Id,
@@ -966,6 +1214,7 @@
             RechargeAmount = amount.RechargeAmount,
             ChannelId = channle.ChannlesNum,
             PlatformRate = platformRate.Rate,
+            PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate / 100,
             ChannleRate = rate,
             ChannlesRakeRate = channle.ChannlesRakeRate,
         };
@@ -986,38 +1235,15 @@
     /// <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;
-        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
-        order.PremiumRate = premium == null ? 0 : premium.Rate;
-        await _lifePayOrderRepository.UpdateAsync(order);
-
-        var desc = "鐢熸椿缂磋垂-";
-        switch (order.LifePayOrderType)
-        {
-            case LifePayOrderTypeEnum.璇濊垂璁㈠崟:
-                desc += "璇濊垂";
-                break;
-            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;
@@ -1030,43 +1256,9 @@
     /// <returns></returns>
     public async Task<ModelPaymentMiniPay> GetPayOrderForJsAPI(GetPayOrderForJsAPIInput 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;
-        var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
-        order.PremiumRate = premium == null ? 0 : premium.Rate;
-        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);
+        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;
-        //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);
-
     }
 
     /// <summary>
@@ -1082,7 +1274,6 @@
         CheckExtensions.IfTrueThrowUserFriendlyException(order.ACOOLYStatus != ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�, "璇ヨ鍗曟棤娉曚慨鏀瑰埌璐﹂噾棰�");
 
         order.ActualReceivedAmount = input.ActualReceivedAmount;
-
         await _lifePayOrderRepository.UpdateAsync(order);
 
         return Constant.SUCCESS;
@@ -1095,8 +1286,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);
     }
@@ -1124,7 +1313,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);
     }
@@ -1148,14 +1337,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);
     }
@@ -1183,7 +1368,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);
     }
@@ -1262,9 +1447,10 @@
     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.宸叉敮浠�)
+        if (order.PayStatus != LifePayStatusEnum.鏈敮浠�)
         {
             return;
         }
@@ -1272,41 +1458,52 @@
         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;
             }
+            _logger.LogInformation("宸插悜渚涘簲鍟嗗彂璧疯鍗�");
 
             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.鍏呭�间腑;
+            _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟锛�" + order.ToJson());
+
+            /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+            await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
+                                order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime);
+            _logger.LogInformation("宸叉彃鍏ユ秷璐硅褰�");
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
             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 WxPayDomesticRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
+    public async Task LifePayRefundsHandler(string orderNo, LifePayRefundStatusEnum refundStatus)
     {
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
@@ -1315,14 +1512,16 @@
         {
             case LifePayRefundStatusEnum.宸查��娆�:
                 order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                order.ACOOLYStatus = ACOOLYStatusEnum.宸查��娆�;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
                 break;
             case LifePayRefundStatusEnum.閫�娆句腑:
                 order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 break;
-            default:break;
+            default: break;
         }
     }
+
 
     /// <summary>
     /// ACOOLYO璁㈠崟閫氱煡澶勭悊
@@ -1330,17 +1529,30 @@
     /// <param name="orderNo"></param>
     /// <param name="outOrderNo"></param>
     /// <returns></returns>
-    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount,string refundApplyRemark)
+    public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount, string refundApplyRemark, decimal? parValue = 0, decimal? actualParValue = 0)
     {
+        await using var orderLock = await distributedLock.TryAcquireAsync($"LockKey:UpdateOrder:{orderNo}", TimeSpan.FromSeconds(60));
+        _logger.LogInformation($"閿侊細LockKey:UpdateOrder:{orderNo} - {orderLock != null}");
+
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
-        //{
-        //    return;
-        //}
+        if (order.ACOOLYStatus.HasValue && (int)order.ACOOLYStatus > (int)acoolyStatus)
+        {
+            _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夌敱{order.ACOOLYStatus}鑷硔acoolyStatus}澶辫触锛屼笉鍙洖婊氱姸鎬�");
+            return;
+        }
 
-        order.PlatformDeductionAmount = payAmount;
+        if (order.LifePayOrderStatus == status && order.ACOOLYStatus == acoolyStatus)
+        {
+            _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夊凡澶勭悊璇ョ姸鎬�");
+            return;
+        }
+
+        order.ActualReceivedAmount = actualParValue;
+        order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2);
+
         if (acoolyOrderNo.IsNotNullOrEmpty())
         {
             order.ACOOLYOrderNo = acoolyOrderNo;
@@ -1358,8 +1570,45 @@
 
         order.LifePayOrderStatus = status;
         order.ACOOLYStatus = acoolyStatus;
-        order.FinishTime = DateTime.Now;
-        await _lifePayOrderRepository.UpdateAsync(order);
+
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�
+            || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+        {
+            order.FinishTime = DateTime.Now;
+        }
+
+        if (order.ACOOLYStatus == ACOOLYStatusEnum.宸查��娆� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+        {
+            order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
+        }
+
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+        {
+            ///缁撶畻娓犻亾浣ｉ噾
+            /// 姣涘埄
+            var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100;
+            /// 娓犻亾浣ｉ噾  锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
+            var channlesRakePrice = grossProfit * (order.ChannlesRakeRate) / 100;
+            if (channlesRakePrice.HasValue)
+            {
+                LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
+                {
+                    OrderNo = order.OrderNo,
+                    PayAmount = order.RechargeAmount ?? 0,
+                    ChannlesRakeRate = order.ChannlesRakeRate ?? 0,
+                    ChannlesRakePrice = channlesRakePrice ?? 0,
+                    FinishTime = order.FinishTime.Value,
+                    ChannelId = order.ChannelId,
+                };
+                await _lifePayChannlesRakeRepository.InsertAsync(lifePayChannlesRake);
+            }
+        }
+
+        /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
+        await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo,
+                    order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue);
+
+        await CurrentUnitOfWork.SaveChangesAsync();
     }
 
     /// <summary>
@@ -1385,7 +1634,7 @@
 
         if (input.LifePayRefundType == LifePayRefundTypeEnum.鍏ㄩ閫�娆�)
         {
-            input.RefundPrice = order.PayAmount;
+            input.RefundPrice = order.PayAmount ?? 0;
         }
 
         if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� || order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayRefundStatus != LifePayRefundStatusEnum.寰呴��娆�)
@@ -1394,42 +1643,43 @@
         }
 
         var outRefundNo = order.ChannelId + CreateRefundOrderNo();
-        order.RefundOrderNo = outRefundNo;
         switch (order.LifePayType)
         {
             case LifePayTypeEnum.WxPay:
-                var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo,order.RefundApplyRemark, Convert.ToInt32(input.RefundPrice * 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.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                    order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
-                }
-                else if (wxRefundResult.Status == "PROCESSING")
-                {
+                    order.RefundOrderNo = outRefundNo;
                     order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
                     order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 }
-                else if (wxRefundResult.Message == "璁㈠崟宸插叏棰濋��娆�")
+                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
                 {
-                    order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
-                    order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+                    throw new UserFriendlyException("閫�娆惧け璐�:" + wxRefundResult.Message);
                 }
 
                 break;
             case LifePayTypeEnum.AliPay:
-                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = input.RefundPrice.ToString() });
+                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, OutRefundNo = outRefundNo, RefundAmount = input.RefundPrice.ToString() });
                 if (aliRefundResult.Code != AlipayResultCode.Success)
                 {
                     throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
                 }
 
-                order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
-                order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+                order.RefundOrderNo = outRefundNo;
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
                 break;
             default: throw new UserFriendlyException("閫�娆惧け璐�");
         }
@@ -1439,6 +1689,8 @@
         order.RefundTime = DateTime.Now;
         order.RefundCheckUserId = CurrentUser.Id;
         order.RefundPrice = input.RefundPrice;
+        order.ActualReceivedAmount = Math.Round((1 - ((order.RefundPrice ?? 0) / (order.PayAmount ?? 0))) * (order.RechargeAmount ?? 0), 2);
+        order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2);
 
         //await _lifePayOrderRepository.UpdateAsync(order);
 
@@ -1500,7 +1752,7 @@
     /// <param name="total"></param>
     /// <param name="currency"></param>
     /// <returns></returns>
-    public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo,string outRefundNo, 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
         {
@@ -1536,8 +1788,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;
@@ -1549,9 +1801,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(),
@@ -1567,7 +1819,7 @@
             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) && extraProperties.Phone == user.PhoneNumber)
@@ -1593,6 +1845,7 @@
         userAccount.DeleterId = userAccount.UserId;
         userAccount.DeletionTime = DateTime.Now;
         userAccount.IsDeleted = true;
+
         return Constant.SUCCESS;
     }
 
@@ -1614,21 +1867,24 @@
 
         if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆�)
         {
-            if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+            if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔�)
             {
                 order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
+                order.LifePayRefundStatus = null;
+            }
+            else
+            {
+                order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+                order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
             }
 
             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
@@ -1645,16 +1901,29 @@
         {
             var dto = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.Id == input.Id.Value);
             CheckExtensions.IfTrueThrowUserFriendlyException(dto == null, "鏈幏鍙栧埌娓犻亾鎶樻墸鏁版嵁");
+            if (!string.IsNullOrWhiteSpace(input.PromoterIdNumber) || !string.IsNullOrWhiteSpace(input.PromoterName))
+            {
+                var promoter = await lifePayPromoterRepository.FirstOrDefaultAsync(it => it.IdNumber == input.PromoterIdNumber && it.Name == input.PromoterName);
+                CheckExtensions.IfTrueThrowUserFriendlyException(promoter == null, "璇ユ帹骞夸汉涓嶅瓨鍦�");
+                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;
             dto.ChannlesRakeRate = input.ChannlesRakeRate;
             dto.SwitchType = input.SwitchType;
             dto.ChannlesType = input.ChannlesType;
-            dto.Status = input.Status;
+            dto.AgentType = input.AgentType;
+            dto.AreaProvinceId = input.AreaProvinceId;
+            dto.AreaCityId = input.AreaCityId;
+
             #region 璁板綍鏃ュ織
 
-            await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
+            await LifePayOrderHistory("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
 
             #endregion
         }
@@ -1663,11 +1932,18 @@
             CheckExtensions.IfTrueThrowUserFriendlyException(input.ChannlesRate < 0.01m, "娓犻亾鎶樻墸璁剧疆閿欒");
             input.Id = Guid.NewGuid();
             var entity = ObjectMapper.Map<CreateEditPayChannelsInput, LifePayChannles>(input);
+            if (!string.IsNullOrWhiteSpace(input.PromoterIdNumber) || !string.IsNullOrWhiteSpace(input.PromoterName))
+            {
+                var promoter = await lifePayPromoterRepository.FirstOrDefaultAsync(it => it.IdNumber == input.PromoterIdNumber && it.Name == input.PromoterName);
+                CheckExtensions.IfTrueThrowUserFriendlyException(promoter == null, "璇ユ帹骞夸汉涓嶅瓨鍦�");
+                entity.PromoterId = promoter.Id;
+            }
+
             await _lifePayChannlesRep.InsertAsync(entity);
 
             #region 璁板綍鏃ュ織
 
-            await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
+            await LifePayOrderHistory("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
 
             #endregion
         }
@@ -1684,8 +1960,7 @@
 
         #region 璁板綍鏃ュ織
 
-        await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
-
+        await LifePayOrderHistory("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
         #endregion
     }
 
@@ -1798,15 +2073,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)
@@ -2004,7 +2285,6 @@
         return message;
     }
 
-
     private async Task<IQueryable<LifePayOrderListOutput>> GetLifePayOrderListFilter(QueryLifePayOrderListInput input)
     {
         var channles = await _lifePayChannlesRep.Where(x => x.ChannlesName.Contains(input.KeyWords)).Select(x => x.ChannlesNum).ToListAsync();
@@ -2021,39 +2301,40 @@
                                             .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.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,
-                                FinishTime = a.FinishTime,
-                                Id = a.Id,
-                                LifePayOrderStatus = a.LifePayOrderStatus,
-                                LifePayOrderType = a.LifePayOrderType,
-                                LifePayType = a.LifePayType,
-                                OrderNo = a.OrderNo,
-                                PayAmount = a.PayAmount,
-                                PhoneNumber = a.PhoneNumber,
-                                RechargeAmount = a.RechargeAmount,
-                                UserId = a.UserId,
-                                OutOrderNo = a.OutOrderNo,
-                                PayStatus = a.PayStatus,
-                                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,
-                            });
+                      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(),
+                          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,
+                          OrderParamDetailJsonStr = a.OrderParamDetailJsonStr
+                      });
 
-        
+
         return result;
     }
 
@@ -2071,61 +2352,69 @@
                                          .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,
-                                FinishTime = a.FinishTime,
-                                Id = a.Id,
-                                LifePayOrderStatus = a.LifePayOrderStatus,
-                                LifePayOrderType = a.LifePayOrderType,
-                                LifePayType = a.LifePayType,
-                                OrderNo = a.OrderNo,
-                                PayAmount = a.PayAmount,
-                                PhoneNumber = a.PhoneNumber,
-                                RechargeAmount = a.RechargeAmount,
-                                UserId = a.UserId,
-                                OutOrderNo = a.OutOrderNo,
-                                PayStatus = a.PayStatus,
-                                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,
-                                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
-                            });
+                                         .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.RefundOrderNo.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,
+                          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 =>
-                    new CreateEditPayChannelsInput
-                    {
-                        Id = x.Id,
-                        ChannlesRate = x.ChannlesRate,
-                        ChannlesRakeRate = x.ChannlesRakeRate,
-                        ChannlesName = x.ChannlesName,
-                        ChannlesNum = x.ChannlesNum,
-                        Status = x.Status,
-                        SwitchType = x.SwitchType,
-                        ChannlesType = x.ChannlesType,
-                    });
+        return from x in _lifePayChannlesRep
+               join p in lifePayPromoterRepository on x.PromoterId equals p.Id into pg
+               from pgd in pg.DefaultIfEmpty()
+               select new CreateEditPayChannelsInput
+               {
+                   Id = x.Id,
+                   ChannlesRate = x.ChannlesRate,
+                   ChannlesRakeRate = x.ChannlesRakeRate,
+                   ChannlesName = x.ChannlesName,
+                   ChannlesNum = x.ChannlesNum,
+                   Status = x.Status,
+                   SwitchType = x.SwitchType,
+                   ChannlesType = x.ChannlesType,
+                   AgentType = x.AgentType,
+                   AreaProvinceId = x.AreaProvinceId,
+                   AreaCityId = x.AreaCityId,
+                   PromoterIdNumber = pgd.IdNumber,
+                   PromoterName = pgd.Name,
+               };
     }
 
-    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal? platformRate,decimal? channleRate,
-        decimal? channlesRakeRate,decimal? premiumRate)
+    public async Task<OrderPriceReturn> GetOrderPrice(decimal price, decimal priceAmount, decimal platformRate, decimal channleRate,
+        decimal channlesRakeRate, decimal premiumRate)
     {
         /// 姣涘埄
         var grossProfit = price * (channleRate - platformRate) / 100;
@@ -2134,20 +2423,20 @@
         var platformPrice = price * platformRate / 100;
 
         /// 鎵嬬画璐�
-        var premiumPrice = priceAmount * premiumRate / 100;
+        var premiumPrice = priceAmount * (premiumRate) / 100;
 
         /// 娓犻亾浣ｉ噾  锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
-        var channlesRakePrice = grossProfit * channlesRakeRate / 100;
+        var channlesRakePrice = grossProfit * (channlesRakeRate) / 100;
 
         /// 鍒╂鼎
         var profit = grossProfit - channlesRakePrice - premiumPrice;
 
         return new OrderPriceReturn()
         {
-            PlatformPrice = platformPrice.HasValue? platformPrice.Value :0,
-            PremiumPrice = premiumPrice.HasValue ? premiumPrice.Value : 0,
-            ChannlesRakePrice = channlesRakePrice.HasValue? channlesRakePrice.Value:0,
-            Profit = profit.HasValue ? profit.Value : 0
+            PlatformPrice = platformPrice,
+            PremiumPrice = premiumPrice,
+            ChannlesRakePrice = channlesRakePrice,
+            Profit = profit
         };
     }
 
@@ -2166,5 +2455,42 @@
         }
     }
 
+    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