From 67fc39c356d8b480b7005cb2fa4769a0a6c6cfb1 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 13 六月 2025 14:19:56 +0800 Subject: [PATCH] pref:优化事务 --- LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 319 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 253 insertions(+), 66 deletions(-) diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs index 48708f5..ddfd419 100644 --- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs +++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; +using StackExchange.Redis; using System; using System.Collections.Generic; using System.Data; @@ -17,10 +18,12 @@ 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 ZeroD.Util.Fadd; using static LifePayment.Domain.Shared.LifePaymentConstant; namespace LifePayment.Application; @@ -43,6 +46,7 @@ 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; @@ -72,7 +76,8 @@ IRepository<LifePayChannles, Guid> lifePayChannlesRep, IRepository<LifePayAccount, Guid> lifePayAccount, IDataFilter dataFilter, - IChannelFilter channelFilter) + IChannelFilter channelFilter, + IAbpDistributedLock distributedLock) { _logger = logger; _aCOOLYManager = aCOOLYManager; @@ -94,11 +99,11 @@ _lifePayAccount = lifePayAccount; this.dataFilter = dataFilter; _channelFilter = channelFilter; + this.distributedLock = distributedLock; _operateHistory = operateHistory; } #region 鏌ヨ - /// <summary> /// 鑾峰彇鐢佃垂闈㈠�� @@ -127,6 +132,16 @@ public async Task<PhoneParValueResponse> GetPhoneParValue() { return await _aCOOLYManager.PhoneParValue(new ACOOLYRequestBaseInput()); + } + + /// <summary> + /// 璇濊垂璁㈠崟鏌ヨ + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input) + { + return await _aCOOLYManager.QueryPhoneOrder(input); } /// <summary> @@ -298,8 +313,41 @@ 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; } @@ -403,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; } @@ -758,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 => @@ -776,9 +826,112 @@ 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<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 @@ -1294,9 +1447,10 @@ public async Task LifePaySuccessHandler(string orderNo, string outOrderNo) { var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); + _logger.LogInformation($"姝e湪澶勭悊璁㈠崟锛歿order?.Id}-{order?.PayStatus}"); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); - if (order.PayStatus == LifePayStatusEnum.宸叉敮浠�) + if (order.PayStatus != LifePayStatusEnum.鏈敮浠�) { return; } @@ -1322,6 +1476,7 @@ default: break; } + _logger.LogInformation("宸插悜渚涘簲鍟嗗彂璧疯鍗�"); order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�; order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑; @@ -1329,10 +1484,12 @@ order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo; 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) { @@ -1342,7 +1499,6 @@ order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�煎け璐�; order.RefundApplyRemark = ex.Message; } - _logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString()); await _lifePayOrderRepository.UpdateAsync(order); } @@ -1375,68 +1531,93 @@ /// <returns></returns> 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, "璁㈠崟涓嶅瓨鍦�"); - - //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�) - //{ - // return; - //} - - order.ActualReceivedAmount = actualParValue; - - if (acoolyOrderNo.IsNotNullOrEmpty()) + await using var orderLock = await distributedLock.TryAcquireAsync($"LockKey:UpdateOrder:{orderNo}", TimeSpan.FromSeconds(60)); + _logger.LogInformation($"閿侊細LockKey:UpdateOrder:{orderNo} - {orderLock != null}"); + try { - order.ACOOLYOrderNo = acoolyOrderNo; - } + var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); - if (status == LifePayOrderStatusEnum.寰呴��娆�) - { - order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�; - } + CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�"); - if (refundApplyRemark.IsNotNullOrEmpty()) - { - order.RefundApplyRemark = refundApplyRemark; - } - - order.LifePayOrderStatus = status; - order.ACOOLYStatus = acoolyStatus; - if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� - || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�) - { - order.FinishTime = DateTime.Now; - order.PlatformDeductionAmount = Math.Round((order.ActualReceivedAmount ?? 0) * (order.PlatformRate ?? 0) / 100, 2); - order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2); - } - - await _lifePayOrderRepository.UpdateAsync(order); - - if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�) - { - ///缁撶畻娓犻亾浣i噾 - /// 姣涘埄 - var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100; - /// 娓犻亾浣i噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣i噾姣斾緥 - var channlesRakePrice = grossProfit * (order.ChannlesRakeRate) / 100; - if (channlesRakePrice.HasValue) + if (order.ACOOLYStatus.HasValue && (int)order.ACOOLYStatus > (int)acoolyStatus) { - 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); + _logger.LogInformation($"璁㈠崟锛坽orderNo}锛夌敱{order.ACOOLYStatus}鑷硔acoolyStatus}澶辫触锛屼笉鍙洖婊氱姸鎬�"); + return; } - } - /// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍 - await _lifePayOrderService.CreatLifePayConsumption(acoolyStatus, order.OrderNo, order.ACOOLYOrderNo, - order.PlatformDeductionAmount ?? 0, order.ChannelId, order.CreationTime, order.FinishTime, order.ChannleRate, parValue, actualParValue); + 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; + } + + if (status == LifePayOrderStatusEnum.寰呴��娆�) + { + order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�; + } + + if (refundApplyRemark.IsNotNullOrEmpty()) + { + order.RefundApplyRemark = refundApplyRemark; + } + + order.LifePayOrderStatus = status; + order.ACOOLYStatus = acoolyStatus; + + 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.宸插畬鎴�) + { + ///缁撶畻娓犻亾浣i噾 + /// 姣涘埄 + var grossProfit = order.RechargeAmount * (order.ChannleRate - order.PlatformRate) / 100; + /// 娓犻亾浣i噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣i噾姣斾緥 + 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.CompleteAsync(); + + _logger.LogInformation("浜嬪姟瀹屾垚"); + } + catch (Exception ex) + { + await CurrentUnitOfWork.RollbackAsync(); + _logger.LogError($"渚涘簲鍟嗗洖璋冨紓甯革細{ex.Message}", ex); + } } /// <summary> @@ -1695,18 +1876,19 @@ 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.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�; + order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�; } order.RefundCheckRemark = input.RefundCheckRemark; order.RefundCheckUserId = CurrentUser.Id; - order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆鹃┏鍥�; await _lifePayOrderRepository.UpdateAsync(order); @@ -1735,6 +1917,9 @@ dto.PromoterId = promoter.Id; } + var rate = await _lifePayRateRepository.FirstOrDefaultAsync(it => it.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵d环); + CheckExtensions.IfTrueThrowUserFriendlyException(rate != null && input.ChannlesRate < rate.Rate, "娓犻亾鎶樻墸鏃犳硶浣庝簬渚涘簲鍟嗘姌鎵�"); + dto.ChannlesName = input.ChannlesName; dto.ChannlesNum = input.ChannlesNum; dto.ChannlesRate = input.ChannlesRate; @@ -1744,6 +1929,7 @@ dto.AgentType = input.AgentType; dto.AreaProvinceId = input.AreaProvinceId; dto.AreaCityId = input.AreaCityId; + #region 璁板綍鏃ュ織 await LifePayOrderHistory("娓犻亾绠$悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles); @@ -2154,6 +2340,7 @@ PlatformDeductionAmount = a.PlatformDeductionAmount, ACOOLYStatus = a.ACOOLYStatus, LifePayRefundStatus = a.LifePayRefundStatus, + OrderParamDetailJsonStr = a.OrderParamDetailJsonStr }); @@ -2174,7 +2361,7 @@ .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.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 -- Gitblit v1.9.1