LifePaymentApi.git

			@@ -28,6 +28,7 @@
			using NPOI.SS.Formula.Functions;
			using StackExchange.Redis;
			using static Volo.Abp.Identity.Settings.IdentitySettingNames;
			using static Microsoft.EntityFrameworkCore.DbLoggerCategory;

			namespace LifePayment.Application;

			@@ -197,6 +198,8 @@
			.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()
			{
			@@ -818,6 +821,57 @@
			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 result = await _aliPayApi.QueryAlipayTradeRefund(input);
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == input.OutTradeNo).FirstOrDefaultAsync();
			if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
			{
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款;
			}

			return result;
			}

			/// <summary>
			/// 查询微信退款订单信息
			/// </summary>
			/// <param name="outTradeNo"></param>
			/// <returns></returns>
			public async Task<WxPayDomesticRefundsQueryReponse> WxPayDomesticRefundsQuery(string outTradeNo)
			{
			return await _wxPayApi.WxPayDomesticRefundsQuery(outTradeNo);
			}

			/// <summary>
			/// 查询微信订单信息
			/// </summary>
			/// <param name="outTradeNo"></param>
			/// <returns></returns>
			public async Task<WxPayTradeQueryReponse> WxPayTradeQuery(string outTradeNo)
			{
			return await _wxPayApi.WxPayTradeQuery(outTradeNo);
			}

			#endregion

			#region 操作
			@@ -839,8 +893,9 @@
			CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");

			var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder && x.PayStatus == LifePayStatusEnum.已支付
			&& x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有相同手机号订单正在充值中，请勿重复充值");
			&& x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中
			&& x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).ToListAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");

			//var rate = await GetRate();
			//CheckExtensions.IfTrueThrowUserFriendlyException(rate.IsNullOrEmpty(), "未配置折扣");
			@@ -896,10 +951,12 @@
			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.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricType)
			&& x.OrderParamDetailJsonStr.Contains(input.ProductData.ElectricAccount)).ToListAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");


			var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认电费折扣);
			@@ -951,7 +1008,7 @@
			//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.LifePayOrderStatus == LifePayOrderStatusEnum.充值中 && x.OrderParamDetailJsonStr.Contains(input.ProductData.GasOrgType)
			&& x.OrderParamDetailJsonStr.Contains(input.ProductData.GasAccount)).ToListAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder.Count() > 0, "您有同户号订单正在充值中，请勿重复充值");

			@@ -1004,8 +1061,8 @@
			//var payUrl = await GetPayQRCode(order.LifePayType.Value, order.OrderNo, desc, 0.01m, 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??0, 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;
			@@ -1370,7 +1427,7 @@

			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);
			@@ -1483,7 +1540,7 @@
			var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
			.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)
			var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.Id != input.Id && x.IsDeleted == false)
			.FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");

			@@ -1497,7 +1554,7 @@
			}
			else
			{
			var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content)
			var repeatAccountContent = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.LifePayType == input.LifePayType && x.Content == input.Content && x.IsDeleted == false)
			.FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatAccountContent != null, "户号已存在");
			var userAccount = new LifePayAccount
			@@ -2118,6 +2175,7 @@
			return channel.ChannlesRate;
			}
			}

			public async Task<SetPayTypeReturn> SetPayType(string orderNo, LifePayTypeEnum lifePayType, string ip)
			{
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();