LifePaymentApi.git

			@@ -1,34 +1,26 @@
			using DynamicQuery.Net.Dto.Input;
			using LifePayment.Application.Contracts;
			using LifePayment.Application.Contracts;
			using LifePayment.Domain;
			using LifePayment.Domain.LifePay;
			using LifePayment.Domain.Models;
			using LifePayment.Domain.Shared;
			using MailKit.Search;
			using Microsoft.EntityFrameworkCore;
			using Microsoft.Extensions.Logging;
			using Microsoft.Extensions.Options;
			using Nest;
			using Newtonsoft.Json;
			using NPOI.OpenXmlFormats.Dml.Chart;
			using NPOI.SS.Formula.Functions;
			using StackExchange.Redis;
			using System;
			using System.Collections.Generic;
			using System.Linq;
			using System.Security.Cryptography;
			using System.Linq.Dynamic.Core;
			using System.Threading.Tasks;
			using Volo.Abp;
			using Volo.Abp.Application.Services;
			using Volo.Abp.Domain.Entities;
			using Volo.Abp.Data;
			using Volo.Abp.Domain.Repositories;
			using Volo.Abp.EventBus.Distributed;
			using ZeroD.Util;
			using ZeroD.Util.Fadd;
			using static LifePayment.Domain.Shared.LifePaymentConstant;
			using Volo.Abp.Data;
			using Z.EntityFramework.Plus;
			using LifePayment.Domain.LifePay;
			using pingan.openbank.api.sdk.enums;
			using ZeroD.Util;
			using Alipay.EasySDK.Payment.Common.Models;
			using static LifePayment.Domain.Shared.LifePaymentConstant;

			namespace LifePayment.Application;

			@@ -162,7 +154,7 @@
			public async Task<List<LifePayIntroInfoOutput>> GetIntroInfo(LifePayOrderTypeEnum lifePayType)
			{
			return await _lifePayIntroInfoRepository.Where(x => x.IsDeleted == false && 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 })
			.Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })
			.ToListAsync();
			}

			@@ -171,15 +163,19 @@
			/// </summary>
			/// <param name="input"></param>
			/// <returns></returns>
			public async Task<PageOutput<UserListOutput>> GetUserPage(PageInput input)
			public async Task<PageOutput<UserListOutput>> GetUserPage(QueryUserPageInput input)
			{
			return await _lifePayUserRepository.Select(x =>
			return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository).Where(x => x.IsDeleted == false)
			.WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) \|\| x.Name.Contains(input.QueryCondition))
			.WhereIf(input.CreationTime.HasValue, x => x.CreationTime.ToString("yyyy-MM-dd") == input.CreationTime.Value.ToString("yyyy-MM-dd"))
			.Select(x =>
			new UserListOutput()
			{
			Id = x.Id,
			CreationChannle = string.IsNullOrEmpty(x.CreationChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.CreationChannleNum).FirstOrDefault().ChannlesName,
			LastLoginChannle = string.IsNullOrEmpty(x.LastLoginChannleNum) ? "" : _lifePayChannlesRep.Where(c => c.ChannlesNum == x.LastLoginChannleNum).FirstOrDefault().ChannlesName,
			PhoneNumber = x.PhoneNumber,
			Name = string.IsNullOrEmpty(x.Name) ? "" : x.Name,
			CreationTime = x.CreationTime,
			LastLoginTime = x.LastLoginTime
			})
			@@ -214,7 +210,6 @@
			})
			.GetPageResult(input.PageModel);
			}

			}

			/// <summary>
			@@ -224,7 +219,6 @@
			/// <returns></returns>
			public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
			{

			var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
			.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
			.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
			@@ -236,7 +230,7 @@
			.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.Id into temp
			join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
			from b in temp.DefaultIfEmpty()
			select new LifePayOrderListOutput
			{
			@@ -260,7 +254,10 @@
			RefundCheckRemark = a.RefundCheckRemark,
			RefundApplyRemark = a.RefundApplyRemark,
			RefundTime = a.RefundTime,
			ChannelName = b.ChannlesName
			ChannelName = b.ChannlesName,
			ActualRechargeAmount = a.ActualRechargeAmount,
			PlatformDeductionAmount = a.PlatformDeductionAmount,
			ACOOLYStatus = a.ACOOLYStatus
			}).GetPageResult(input.PageModel);

			return result;
			@@ -278,7 +275,7 @@
			return new PageOutput<UserLifePayOrderOutput>();
			}

			return await _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.未支付)
			return await _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository).Where(x => x.PayStatus != LifePayStatusEnum.未支付)
			.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
			.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
			.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
			@@ -400,7 +397,7 @@

			public async Task<UserLifePayOrderRefundOutput> GetUserLifePayOrderRefund(Guid id)
			{
			var order = await _lifePayOrderRepository.Where(x => x.Id == id).Select(x =>
			var order = await _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository).Where(x => x.Id == id).Select(x =>
			new UserLifePayOrderRefundOutput
			{
			Id = x.Id,
			@@ -566,7 +563,7 @@
			PayAmount = amount.PayAmont,
			DiscountAmount = amount.DiscountAmount,
			RechargeAmount = amount.RechargeAmount,
			ChannelId = channle.Id
			ChannelId = channle.ChannlesNum
			};

			await CreateLifePayOrder(orderInput);
			@@ -610,7 +607,7 @@
			PayAmount = amount.PayAmont,
			DiscountAmount = amount.DiscountAmount,
			RechargeAmount = amount.RechargeAmount,
			ChannelId = channle.Id
			ChannelId = channle.ChannlesNum
			};

			await CreateLifePayOrder(orderInput);
			@@ -654,7 +651,7 @@
			PayAmount = amount.PayAmont,
			DiscountAmount = amount.DiscountAmount,
			RechargeAmount = amount.RechargeAmount,
			ChannelId = channle.Id
			ChannelId = channle.ChannlesNum
			};

			await CreateLifePayOrder(orderInput);
			@@ -971,7 +968,7 @@
			/// <param name="orderNo"></param>
			/// <param name="outOrderNo"></param>
			/// <returns></returns>
			public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status)
			public async Task ACOOLYOrderNotifyHandler(string orderNo, string acoolyOrderNo, LifePayOrderStatusEnum status, ACOOLYStatusEnum acoolyStatus, decimal payAmount)
			{
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
			@@ -982,6 +979,8 @@
			}

			order.LifePayOrderStatus = status;
			order.ACOOLYStatus = acoolyStatus;
			order.PlatformDeductionAmount = payAmount;
			if (acoolyOrderNo.IsNotNullOrEmpty())
			{
			order.ACOOLYOrderNo = acoolyOrderNo;
			@@ -1021,11 +1020,39 @@
			throw new UserFriendlyException("当前订单状态无法退款");
			}

			/// TODO 退款请求完成后如何操作
			/// var refundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
			switch (order.LifePayType)
			{
			case LifePayTypeEnum.WxPay:
			var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
			if (wxRefundResult.Status == "SUCCESS")
			{
			order.PayStatus = LifePayStatusEnum.已退款;
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			}
			else if (wxRefundResult.Status == "PROCESSING")
			{
			order.PayStatus = LifePayStatusEnum.退款中;
			order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中;
			}
			else
			{
			throw new UserFriendlyException("退款失败");
			}

			order.PayStatus = LifePayStatusEnum.已退款;
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			break;
			case LifePayTypeEnum.AliPay:
			var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = order.PayAmount.ToString() });
			if (aliRefundResult.Code != AlipayResultCode.Success)
			{
			throw new UserFriendlyException("退款失败");
			}

			order.PayStatus = LifePayStatusEnum.已退款;
			order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款;
			break;
			default: throw new UserFriendlyException("退款失败");
			}

			order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
			order.RefundCheckRemark = input.RefundCheckRemark;
			order.RefundTime = DateTime.Now;
			@@ -1069,11 +1096,20 @@

			order.LifePayOrderStatus = LifePayOrderStatusEnum.退款待审核;
			order.RefundApplyRemark = input.RefundApplyRemark;
			order.RefundTime = DateTime.Now;
			order.RefundApplyTime = DateTime.Now;

			await _lifePayOrderRepository.UpdateAsync(order);
			}

			/// <summary>
			/// 微信退款
			/// </summary>
			/// <param name="outTradeNo"></param>
			/// <param name="reason"></param>
			/// <param name="refund"></param>
			/// <param name="total"></param>
			/// <param name="currency"></param>
			/// <returns></returns>
			public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
			{
			WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
			@@ -1094,8 +1130,16 @@
			return res;
			}

			private async Task<AlipayTradeRefundResponse> AliTradeRefund(AlipayTradeRefundRequest input)
			{
			return await _aliPayApi.TradeRefund(input);
			}

			public async Task<int> AddUpdateUserAccount(AddUpdateUserAccountInput input)
			{
			var user = await _lifePayUserRepository.Where(r => r.Id == input.UserId && !r.IsDeleted).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(user == null, "用户不存在");

			if (input.Id.HasValue)
			{
			var userAccount = await _lifePayAccount.Where(x => x.UserId == input.UserId && x.Id == input.Id)
			@@ -1132,6 +1176,16 @@
			};
			await _lifePayAccount.InsertAsync(userAccount);
			}

			if (input.LifePayType == LifePayOrderTypeEnum.话费订单)
			{
			var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
			if (!string.IsNullOrEmpty(extraProperties.Name))
			{
			user.Name = extraProperties.Name;
			}
			}


			return Constant.SUCCESS;
			}
			@@ -1474,7 +1528,6 @@
			CheckExtensions.IfTrueThrowUserFriendlyException(amount <= 0,
			CustomeErrorMessage.SometingMustSometing,
			"获取支付二维码时金额", "大于0");

			var res = await _wxPayApi.PayTransactionsH5(new PayTransactionsNativeH5
			{
			Appid = _wxPayOptions.AppID,
			@@ -1527,6 +1580,7 @@

			return res.QrCode;
			}

			/// <summary>
			/// 构造待签名字符串
			/// </summary>
			@@ -1555,7 +1609,7 @@
			.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.Id into temp
			join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
			from b in temp.DefaultIfEmpty()
			select new LifePayOrderListOutput
			{
			@@ -1600,5 +1654,5 @@
			});
			}

			#endregion
			}
			#endregion
			}