From 78bf5ae3845bd2d7008eae76a1d4facb2d29280b Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 15:11:42 +0800
Subject: [PATCH] fix:部分退款接口更新
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 585 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 527 insertions(+), 58 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 5338c44..e4e9294 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1,33 +1,31 @@
-锘縰sing DynamicQuery.Net.Dto.Input;
-using LifePayment.Application.Contracts;
+锘縰sing 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 static IdentityServer4.Models.IdentityResources;
-using Volo.Abp.Data;
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;
namespace LifePayment.Application;
@@ -37,13 +35,18 @@
private readonly ILogger<LifePayService> _logger;
private readonly IRepository<LifePayRate, Guid> _lifePayRateRepository;
+ private readonly IRepository<LifePayPremium, Guid> _lifePayPremiumRepository;
private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
+ private readonly IRepository<LifePayIntroInfo, Guid> _lifePayIntroInfoRepository;
+ private readonly IRepository<DallyStatistics, Guid> _dallyStatisticsRepository;
private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
+ private readonly IRepository<OperateHistory, Guid> _operateHistory;
private readonly IDataFilter dataFilter;
-
+ private readonly IChannelFilter _channelFilter;
private readonly IAliPayApi _aliPayApi;
+ private readonly IAlipayInterfaceManager _alipayInterfaceManager;
private readonly IWxPayApi _wxPayApi;
private readonly WxPayOption _wxPayOptions;
@@ -55,28 +58,100 @@
IRepository<LifePayRate, Guid> lifePayRateRepository,
IRepository<LifePayOrder, Guid> lifePayOrderRepository,
IRepository<LifePayUser, Guid> lifePayUserRepository,
+ IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
+ IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
+ IRepository<DallyStatistics, Guid> dallyStatisticsRepository,
+ IRepository<OperateHistory, Guid> operateHistory,
IAliPayApi aliPayApi,
+ IAlipayInterfaceManager aliPayInterfaceManager,
IWxPayApi wxPayApi,
IOptions<WxPayOption> wxPayOptions,
IRepository<LifePayChannles, Guid> lifePayChannlesRep,
IRepository<LifePayAccount, Guid> lifePayAccount,
- IDataFilter dataFilter)
+ IDataFilter dataFilter,
+ IChannelFilter channelFilter)
{
_logger = logger;
_aCOOLYManager = aCOOLYManager;
_lifePayRateRepository = lifePayRateRepository;
_lifePayOrderRepository = lifePayOrderRepository;
_lifePayUserRepository = lifePayUserRepository;
+ _lifePayPremiumRepository = lifePayPremiumRepository;
+ _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
+ _dallyStatisticsRepository = dallyStatisticsRepository;
_aliPayApi = aliPayApi;
+ _alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
_distributedEventBus = distributedEventBus;
_lifePayChannlesRep = lifePayChannlesRep;
_lifePayAccount = lifePayAccount;
this.dataFilter = dataFilter;
+ _channelFilter = channelFilter;
+ _operateHistory = operateHistory;
}
#region 鏌ヨ
+
+ public async Task<TopStatisticsOutput> GetTopStatistics()
+ {
+ var today = DateTime.Now.Date;
+ var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.Date == today).FirstOrDefaultAsync();
+ if (statistics == null)
+ {
+ var accumulatedReceipts = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.PayAmount);
+ var receiptsYesterday = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today).SumAsync(x => x.PayAmount);
+ var accumulatedOrders = await _lifePayOrderRepository.Where(x => x.CreationTime < today).CountAsync();
+ var accumulatedIncome = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.ActualRechargeAmount);
+ var ordersNumYesterday = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today).CountAsync();
+ var yesterdaySuccess = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�).CountAsync();
+ var yesterdayFail = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐�).CountAsync();
+ var accumulatedUsers = await _lifePayUserRepository.CountAsync();
+
+ var entity = new DallyStatistics()
+ {
+ Id = GuidGenerator.Create(),
+ CreationTime = DateTime.Now,
+ Amount = 0,
+ AccumulatedReceipts = accumulatedReceipts,
+ ReceiptsYesterday = receiptsYesterday,
+ AccumulatedOrders = accumulatedOrders,
+ OrdersNumYesterday = ordersNumYesterday,
+ YesterdaySuccess = yesterdaySuccess,
+ YesterdayFail = yesterdayFail,
+ AccumulatedUsers = accumulatedUsers,
+ };
+ await _dallyStatisticsRepository.InsertAsync(entity);
+
+ TopStatisticsOutput topStatisticsOutput = new TopStatisticsOutput()
+ {
+ Amount = entity.Amount,
+ AccumulatedReceipts = entity.AccumulatedReceipts,
+ ReceiptsYesterday = entity.ReceiptsYesterday,
+ AccumulatedOrders = entity.AccumulatedOrders,
+ OrdersNumYesterday = entity.OrdersNumYesterday,
+ YesterdaySuccess = entity.YesterdaySuccess,
+ YesterdayFail = entity.YesterdayFail,
+ AccumulatedUsers = entity.AccumulatedUsers,
+ };
+ return topStatisticsOutput;
+ }
+ else
+ {
+ TopStatisticsOutput topStatisticsOutput = new TopStatisticsOutput()
+ {
+ Amount = statistics.Amount,
+ AccumulatedReceipts = statistics.AccumulatedReceipts,
+ ReceiptsYesterday = statistics.ReceiptsYesterday,
+ AccumulatedOrders = statistics.AccumulatedOrders,
+ OrdersNumYesterday = statistics.OrdersNumYesterday,
+ YesterdaySuccess = statistics.YesterdaySuccess,
+ YesterdayFail = statistics.YesterdayFail,
+ AccumulatedUsers = statistics.AccumulatedUsers,
+ };
+ return topStatisticsOutput;
+ }
+ }
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
@@ -137,17 +212,45 @@
}
/// <summary>
+ /// 鑾峰彇鎵嬬画璐硅垂鐜�
+ /// </summary>
+ /// <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 })
+ .ToListAsync();
+ }
+
+ /// <summary>
+ /// 椤荤煡閰嶇疆
+ /// </summary>
+ /// <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)
+ .Select(x => new LifePayIntroInfoOutput() { Type = x.Type, ContentSummary = x.ContentSummary, Content = x.Content, LifePayType = x.LifePayType, Path = x.Path, Sequence = x.Sequence })
+ .ToListAsync();
+ }
+
+ /// <summary>
/// 鑾峰彇鐢ㄦ埛鍒嗛〉鏁版嵁
/// </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.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
+ .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
+ .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
})
@@ -182,7 +285,6 @@
})
.GetPageResult(input.PageModel);
}
-
}
/// <summary>
@@ -192,7 +294,7 @@
/// <returns></returns>
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayOrderPage(QueryLifePayOrderListInput input)
{
- var result = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus != LifePayStatusEnum.鏈敮浠�)
+ 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)
.WhereIf(input.BeginPayTime.HasValue, x => x.PayTime >= input.BeginPayTime)
@@ -200,10 +302,68 @@
.WhereIf(input.EndPayTime.HasValue, x => x.PayTime <= input.EndPayTime)
.WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
.WhereIf(input.PayStatus.HasValue, x => x.PayStatus == input.PayStatus.Value)
+ .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
.WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
- 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
+ {
+ 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,
+ }).GetPageResult(input.PageModel);
+
+ return result;
+ }
+
+ /// <summary>
+ /// 閫�娆捐鍗曞垎椤�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
+ {
+
+ var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
+ .Where(x => x.PayStatus == LifePayStatusEnum.寰呴��娆� || x.PayStatus == LifePayStatusEnum.宸查��娆� || x.PayStatus == LifePayStatusEnum.閫�娆句腑
+ || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳 || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧け璐�
+ || x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆�)
+ .WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
+ .WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
+ .WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
+ .WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
+ .WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
+ .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
+ .WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
+ .WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
+ .WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
+ .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.OrderNo.Contains(input.KeyWords) || x.OutOrderNo.Contains(input.KeyWords) || x.ACOOLYOrderNo.Contains(input.KeyWords))
+ join b in _lifePayChannlesRep on a.ChannelId equals b.ChannlesNum into temp
from b in temp.DefaultIfEmpty()
select new LifePayOrderListOutput
{
@@ -226,9 +386,113 @@
CreationTime = a.CreationTime,
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
+ RefundApplyTime = a.RefundApplyTime,
RefundTime = a.RefundTime,
- ChannelName = b.ChannlesName
+ RefundPrice = a.RefundPrice,
+ ChannelName = b.ChannlesName,
+ ActualRechargeAmount = a.ActualRechargeAmount,
+ PlatformDeductionAmount = a.PlatformDeductionAmount,
+ ACOOLYStatus = a.ACOOLYStatus,
+ LifePayRefundStatus = a.LifePayRefundStatus,
}).GetPageResult(input.PageModel);
+
+ return result;
+ }
+
+ public async Task<LifePayOrderOutput> GetLifePayOrderDetail(string orderNo)
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+ var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+ var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+ var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
+
+ var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
+ var result = new LifePayOrderOutput()
+ {
+ UserName = user.Name,
+ UserPhoneNumber = user.PhoneNumber,
+ DiscountAmount = order.DiscountAmount,
+ FinishTime = order.FinishTime,
+ Id = order.Id,
+ OutOrderNo = order.OutOrderNo,
+ LifePayChannle = channle.ChannlesName,
+ Status = order.LifePayOrderStatus,
+ LifePayOrderType = order.LifePayOrderType,
+ LifePayType = order.LifePayType,
+ OrderNo = order.OrderNo,
+ PayAmount = order.PayAmount,
+ RechargeAmount = order.RechargeAmount,
+ PayStatus = order.PayStatus,
+ PayTime = order.PayTime,
+ OrderParamDetailJsonStr = order.OrderParamDetailJsonStr,
+ RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
+ CreationTime = order.CreationTime,
+ RefundCheckRemark = order.RefundCheckRemark,
+ RefundApplyRemark = order.RefundApplyRemark,
+ RefundTime = order.RefundTime,
+ ACOOLYOrderNo = order.ACOOLYOrderNo,
+ LifePayRefundStatus = order.LifePayRefundStatus,
+ ActualRechargeAmount = order.ActualRechargeAmount,
+ RefundPrice = order.RefundPrice,
+ PlatformRate = platformRate.Rate,
+ PlatformPrice = order.PlatformDeductionAmount,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
+ ChannleRate = channle.ChannlesRate,
+ ChannlesRakeRate = channle.ChannlesRakeRate,
+ ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
+ PremiumRate = premium == null ? 0 : premium.Rate,
+ PremiumPrice = premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2),
+ Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - (premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2))
+ };
+
+ return result;
+ }
+
+ public async Task<LifePayRefundOrderOutput> GetLifePayRefundOrderDetail(string orderNo)
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+ var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+ var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
+ var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
+
+ var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
+ var result = new LifePayRefundOrderOutput()
+ {
+ UserName = user.Name,
+ UserPhoneNumber = user.PhoneNumber,
+ DiscountAmount = order.DiscountAmount,
+ FinishTime = order.FinishTime,
+ Id = order.Id,
+ OutOrderNo = order.OutOrderNo,
+ LifePayChannle = channle.ChannlesName,
+ Status = order.LifePayOrderStatus,
+ LifePayOrderType = order.LifePayOrderType,
+ LifePayType = order.LifePayType,
+ OrderNo = order.OrderNo,
+ PayAmount = order.PayAmount,
+ RechargeAmount = order.RechargeAmount,
+ PayStatus = order.PayStatus,
+ PayTime = order.PayTime,
+ RefundCredentialsImgUrl = order.RefundCredentialsImgUrl.GetOssPath(),
+ CreationTime = order.CreationTime,
+ RefundCheckRemark = order.RefundCheckRemark,
+ RefundApplyRemark = order.RefundApplyRemark,
+ RefundApplyTime = order.RefundApplyTime,
+ RefundTime = order.RefundTime,
+ RefundOrderNo = order.RefundOrderNo,
+ ACOOLYOrderNo = order.ACOOLYOrderNo,
+ LifePayRefundStatus = order.LifePayRefundStatus,
+ ActualRechargeAmount = order.ActualRechargeAmount,
+ ActualReceivedAmount = order.ActualReceivedAmount,
+ RefundPrice = order.RefundPrice,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
+ };
return result;
}
@@ -245,7 +509,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)
@@ -310,6 +574,8 @@
return result;
}
+
+
/// <summary>
/// 鏍规嵁璁㈠崟鍙疯幏鍙栨敮浠樼姸鎬�
/// </summary>
@@ -324,19 +590,12 @@
public async Task<PageOutput<CreateEditPayChannelsInput>> GetLifePayChannlesPage(PageInput input)
{
+ return await GetLifePayChannlesListFilter().GetPageResult(input.PageModel);
+ }
- return await _lifePayChannlesRep.Select(x =>
- new CreateEditPayChannelsInput
- {
- Id = x.Id,
- ChannlesRate = x.ChannlesRate,
- ChannlesName = x.ChannlesName,
- ChannlesNum = x.ChannlesNum,
- Status = x.Status,
- SwitchType = x.SwitchType,
- ChannlesType = x.ChannlesType,
- })
- .GetPageResult(input.PageModel);
+ public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
+ {
+ return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
@@ -346,6 +605,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -361,6 +621,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -372,7 +633,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,
@@ -499,7 +760,54 @@
});
return result;
}
+ public async Task<string> GetBillErceiptExport(string orderNo)
+ {
+ try
+ {
+ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
+ CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "鏈壘鍒拌鍗曚俊鎭�");
+ if (order.LifePayType == LifePayTypeEnum.AliPay)
+ {
+ var elecInfoInput = new DataBillErceiptApplyInput
+ {
+ Type = "FUND_DETAIL",
+ Key = order.OutOrderNo
+ };
+
+ var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);
+ if (elecInfoOutput != null)
+ {
+ var elecFileInput = new DataBillEreceiptQueryInput
+ {
+ FileId = elecInfoOutput.FileId,
+ };
+ var elecFileOutput = await _alipayInterfaceManager.DataBillEreceiptQuery(elecFileInput);
+ if (!string.IsNullOrEmpty(elecFileOutput.DownloadUrl))
+ {
+ return elecFileOutput.DownloadUrl;
+ }
+ return "";
+ }
+ return "";
+ }
+ else
+ {
+ WxPayTradeBillApplyRequest req = new WxPayTradeBillApplyRequest
+ {
+ OutBillNo = order.OutOrderNo,
+ };
+
+ var res = await _wxPayApi.WxPayTradeBillApply(req);
+ return "";
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError("鑾峰彇璁㈠崟鍙蜂负{0}鐢靛瓙鍥炲崟鍑虹幇閿欒锛歿1}", orderNo, ex.Message);
+ return "";
+ }
+ }
#endregion
#region 鎿嶄綔
@@ -527,7 +835,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
//LifePayType = input.LifePayType,
@@ -538,7 +846,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -571,7 +879,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
// LifePayType = input.LifePayType,
@@ -582,7 +890,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -615,7 +923,7 @@
var orderInput = new CreateLifePayOrderInput
{
- OrderNo = CreateOrderNo(),
+ OrderNo = channle.ChannlesNum + CreateOrderNo(),
LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
// LifePayType = input.LifePayType,
@@ -626,7 +934,7 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.Id
+ ChannelId = channle.ChannlesNum
};
await CreateLifePayOrder(orderInput);
@@ -662,6 +970,9 @@
break;
case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
desc += "鐢佃垂";
+ break;
+ case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+ desc += "鐕冩皵";
break;
default:
break;
@@ -849,10 +1160,12 @@
OpenId = openid
}
};
+ Logger.LogError("璋冪敤璇锋眰锛�" + req.ToJson());
var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
string nonce = Guid.NewGuid().ToString();
var res = await _wxPayApi.PayTransactionsJsAPI(req);
+ Logger.LogError("璋冪敤缁撴灉锛�" + res.ToJson());
string package = "prepay_id=" + res.PrepayId;
ModelPaymentMiniPay info = new ModelPaymentMiniPay();
if (res != null)
@@ -922,6 +1235,7 @@
break;
}
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�;
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
//SetOrderStatus(order, result.Code);
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
@@ -931,7 +1245,7 @@
{
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插け璐�;
- order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
_logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
await _lifePayOrderRepository.UpdateAsync(order);
@@ -943,7 +1257,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, "璁㈠崟涓嶅瓨鍦�");
@@ -953,7 +1267,7 @@
return;
}
- order.LifePayOrderStatus = status;
+ order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
order.ACOOLYOrderNo = acoolyOrderNo;
@@ -968,6 +1282,9 @@
{
order.PayStatus = LifePayStatusEnum.寰呴��娆�;
}
+
+ order.LifePayOrderStatus = status;
+ order.ACOOLYStatus = acoolyStatus;
await _lifePayOrderRepository.UpdateAsync(order);
}
@@ -987,27 +1304,70 @@
{
return;
}
+ if (input.RefundPrice > order.PayAmount)
+ {
+ throw new UserFriendlyException("閫�娆剧殑閲戦涓嶈兘澶т簬瀹炰粯閲戦");
+ }
+ if (input.LifePayRefundType == LifePayRefundTypeEnum.鍏ㄩ閫�娆� && input.RefundPrice != order.PayAmount)
+ {
+ throw new UserFriendlyException("鍏ㄩ閫�娆剧殑閲戦涓庡疄浠橀噾棰濅笉涓�鑷�");
+ }
if (order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳)
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
}
- /// TODO 閫�娆捐姹傚畬鎴愬悗濡備綍鎿嶄綔
- /// var refundResult = await WxPayDomesticRefunds(order.OrderNo, order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
+ 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")
+ {
+ order.PayStatus = LifePayStatusEnum.宸查��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ }
+ else if (wxRefundResult.Status == "PROCESSING")
+ {
+ order.PayStatus = LifePayStatusEnum.閫�娆句腑;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
+ }
+ else
+ {
+ order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ }
- order.PayStatus = LifePayStatusEnum.宸查��娆�;
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ break;
+ case LifePayTypeEnum.AliPay:
+ var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice * 100).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;
order.RefundCheckUserId = CurrentUser.Id;
+ order.RefundPrice = input.RefundPrice;
await _lifePayOrderRepository.UpdateAsync(order);
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("閫�娆�", "閫�娆�", order.Id);
+ await LifePayOrderHistory("閫�娆�", "閫�娆�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
#endregion
@@ -1041,17 +1401,26 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳;
order.RefundApplyRemark = input.RefundApplyRemark;
- order.RefundTime = DateTime.Now;
+ order.RefundApplyTime = DateTime.Now;
await _lifePayOrderRepository.UpdateAsync(order);
}
- public async Task<WxPayDomesticRefundsReponse> WxPayDomesticRefunds(string outTradeNo, string reason, int refund, int total, string currency = "CNY")
+ /// <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 outRefundNo, string reason, int refund, int total, string currency = "CNY")
{
WxPayDomesticRefundsRequest req = new WxPayDomesticRefundsRequest
{
OutTradeNo = outTradeNo,
- OutRefundNo = CreateRefundOrderNo(),
+ OutRefundNo = outRefundNo,
Reason = reason,
Amount = new Model_WxPayDomesticRefunds_Amount
{
@@ -1066,8 +1435,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)
@@ -1104,6 +1481,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;
}
@@ -1172,6 +1559,7 @@
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;
@@ -1219,6 +1607,7 @@
CheckExtensions.IfTrueThrowUserFriendlyException(dto.Status == LifePayChannelsStatsEnum.绂佺敤, "褰撳墠娓犻亾鍟嗗凡绂佺敤");
return true;
}
+
public async Task CreateEditLifePayRate(List<LifePayRateInput> input)
{
CheckExtensions.IfTrueThrowUserFriendlyException(input.Where(r => r.Rate <= 0).Any(), "鎶樻墸涓嶅緱灏忎簬绛変簬0");
@@ -1248,11 +1637,62 @@
{
await _lifePayRateRepository.InsertManyAsync(listData);
}
-
}
+ public async Task CreateEditLifePayPremium(List<LifePayPremiumInput> input)
+ {
+ CheckExtensions.IfTrueThrowUserFriendlyException(input.Where(r => r.Rate < 0).Any(), "鎶樻墸涓嶅緱灏忎簬0");
+ var listData = new List<LifePayPremium>();
+ foreach (var item in input)
+ {
+ var tmpDto = await _lifePayPremiumRepository.FirstOrDefaultAsync(r => r.PremiumType == item.PremiumType);
+ if (tmpDto != null)
+ {
+ tmpDto.Rate = item.Rate;
+ }
+ else
+ {
+ listData.Add(new LifePayPremium
+ {
+ CreationTime = DateTime.Now,
+ Rate = item.Rate,
+ PremiumType = item.PremiumType,
+ Id = Guid.NewGuid(),
+ });
+ }
+ }
+ if (listData.Any())
+ {
+ await _lifePayPremiumRepository.InsertManyAsync(listData);
+ }
+ }
+ public async Task EditIntroInfo(LifePayIntroInfoInput input)
+ {
+ var listData = new List<LifePayIntroInfo>();
+ foreach (var item in input.Data)
+ {
+ var tmpDto = await _lifePayIntroInfoRepository.Where(r => r.LifePayType == input.LifePayType).DeleteAsync();
+
+ listData.Add(new LifePayIntroInfo
+ {
+ LifePayType = input.LifePayType,
+ CreationTime = DateTime.Now,
+ Type = item.Type,
+ ContentSummary = item.ContentSummary,
+ Content = item.Content,
+ Path = item.Path,
+ Sequence = item.Sequence,
+ Id = Guid.NewGuid(),
+ });
+ }
+
+ if (listData.Any())
+ {
+ await _lifePayIntroInfoRepository.InsertManyAsync(listData);
+ }
+ }
#endregion
#region 绉佹湁
@@ -1270,10 +1710,10 @@
private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
{
/// 姝ｅ父鏀粯
- var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+ //var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
/// 1鍒嗛挶鏀粯
- //decimal payAmount = 0.01m;
+ decimal payAmount = 0.01m;
CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
@@ -1313,6 +1753,20 @@
};
await _distributedEventBus.PublishAsync(recordEto, false);
+ }
+
+ private async Task LifePayOrderHistory(string operateContent, string operateName, Guid relationId, int? tableType = (int)OperateHistoryTypeEnum.LifePayRefund)
+ {
+ var operateHistory = new OperateHistory
+ {
+ CreatorName = CurrentUser.Name,
+ OperateContent = operateName,
+ OperateName = operateName,
+ RelationId = relationId,
+ TableType = tableType
+
+ };
+ await _operateHistory.InsertAsync(operateHistory);
}
/// <summary>
@@ -1393,7 +1847,6 @@
CheckExtensions.IfTrueThrowUserFriendlyException(amount <= 0,
CustomeErrorMessage.SometingMustSometing,
"鑾峰彇鏀粯浜岀淮鐮佹椂閲戦", "澶т簬0");
-
var res = await _wxPayApi.PayTransactionsH5(new PayTransactionsNativeH5
{
Appid = _wxPayOptions.AppID,
@@ -1446,6 +1899,7 @@
return res.QrCode;
}
+
/// <summary>
/// 鏋勯�犲緟绛惧悕瀛楃涓�
/// </summary>
@@ -1474,7 +1928,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
{
@@ -1503,6 +1957,21 @@
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,
+ });
+ }
#endregion
}
--
Gitblit v1.9.1