From d7b01cca243ea2a767adbb1418a52258b4f2d765 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 17:27:07 +0800
Subject: [PATCH] fix:状态更新
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 289 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 204 insertions(+), 85 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index dc14ec6..c0a5a6f 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -25,6 +25,8 @@
using Nest;
using Volo.Abp.Domain.Entities;
using Volo.Abp.ObjectMapping;
+using NPOI.SS.Formula.Functions;
+using StackExchange.Redis;
namespace LifePayment.Application;
@@ -41,9 +43,11 @@
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;
@@ -57,8 +61,9 @@
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,
@@ -73,8 +78,8 @@
_lifePayUserRepository = lifePayUserRepository;
_lifePayPremiumRepository = lifePayPremiumRepository;
_lifePayIntroInfoRepository = lifePayIntroInfoRepository;
- _dallyStatisticsRepository = dallyStatisticsRepository;
_aliPayApi = aliPayApi;
+ _alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
_distributedEventBus = distributedEventBus;
@@ -82,41 +87,11 @@
_lifePayAccount = lifePayAccount;
this.dataFilter = dataFilter;
_channelFilter = channelFilter;
+ _operateHistory = operateHistory;
}
#region 鏌ヨ
- public async Task<TopStatisticsOutput> GetTopStatistics()
- {
- var today = DateTime.Now.ToString("yyyy-MM-dd");
- var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.ToString("yyyy-MM-dd") == today).FirstOrDefaultAsync();
- if (statistics == null)
- {
- //var accumulatedReceipts = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.PayAmount);
-
- var entity = new DallyStatistics()
- {
- Id = GuidGenerator.Create(),
- CreationTime = DateTime.Now,
- Amount = "0",
- AccumulatedReceipts = "0",
- ReceiptsYesterda = "0",
- AccumulatedOrders = "0",
- OrdersNumYesterda = "0",
- YesterdaSuccess = "0",
- YesterdaFail = "0",
- AccumulatedUsers = "0",
- };
-
- return new TopStatisticsOutput();
- }
- else
- {
- var result = ObjectMapper.Map<DallyStatistics,TopStatisticsOutput>(statistics);
- return result;
- }
-
- }
/// <summary>
/// 鑾峰彇鐢佃垂闈㈠��
@@ -267,6 +242,63 @@
.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.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.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))
@@ -293,7 +325,9 @@
CreationTime = a.CreationTime,
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
+ RefundApplyTime = a.RefundApplyTime,
RefundTime = a.RefundTime,
+ RefundPrice = a.RefundPrice,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.ActualRechargeAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
@@ -307,10 +341,8 @@
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, "璁㈠崟涓嶅瓨鍦�");
+ 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;
@@ -341,14 +373,16 @@
LifePayRefundStatus = order.LifePayRefundStatus,
ActualRechargeAmount = order.ActualRechargeAmount,
RefundPrice = order.RefundPrice,
- PlatformRate = platformRate.Rate,
+ PlatformRate = order.PlatformRate,
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))
+ PremiumRate = order.PremiumRate,
+ PremiumPrice = Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value:0), 2),
+ Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value : 0), 2)
};
return result;
@@ -385,12 +419,16 @@
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;
@@ -659,7 +697,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 鎿嶄綔
@@ -685,10 +770,13 @@
var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿璇濊垂鎶樻墸).Rate);
+ var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+
+
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
//LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -698,7 +786,10 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.ChannlesNum
+ ChannelId = channle.ChannlesNum,
+ PlatformRate = platformRate.Rate,
+ ChannleRate = channle.ChannlesRate,
+ ChannlesRakeRate = channle.ChannlesRakeRate,
};
await CreateLifePayOrder(orderInput);
@@ -729,10 +820,12 @@
var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐢佃垂鎶樻墸).Rate);
+ var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -742,7 +835,10 @@
PayAmount = amount.PayAmont,
DiscountAmount = amount.DiscountAmount,
RechargeAmount = amount.RechargeAmount,
- ChannelId = channle.ChannlesNum
+ ChannelId = channle.ChannlesNum,
+ PlatformRate = platformRate.Rate,
+ ChannleRate = channle.ChannlesRate,
+ ChannlesRakeRate = channle.ChannlesRakeRate,
};
await CreateLifePayOrder(orderInput);
@@ -773,10 +869,12 @@
var amount = CalculateAmount(input.ProductData.ParValue, rate.FirstOrDefault(x => x.RateType == LifePayRateTypeEnum.榛樿鐕冩皵鎶樻墸).Rate);
+ var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
+
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -811,7 +909,8 @@
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 = "鐢熸椿缂磋垂-";
@@ -822,6 +921,9 @@
break;
case LifePayOrderTypeEnum.鐢佃垂璁㈠崟:
desc += "鐢佃垂";
+ break;
+ case LifePayOrderTypeEnum.鐕冩皵璁㈠崟:
+ desc += "鐕冩皵";
break;
default:
break;
@@ -1084,7 +1186,8 @@
break;
}
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+ 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;
@@ -1092,8 +1195,8 @@
catch (Exception ex)
{
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插け璐�;
- order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
_logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
await _lifePayOrderRepository.UpdateAsync(order);
@@ -1110,29 +1213,20 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- {
- return;
- }
+ //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ //{
+ // return;
+ //}
- order.LifePayOrderStatus = status;
- order.ACOOLYStatus = acoolyStatus;
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
order.ACOOLYOrderNo = acoolyOrderNo;
}
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- {
- order.FinishTime = DateTime.Now;
- }
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.宸查��娆�)
- {
- order.PayStatus = LifePayStatusEnum.寰呴��娆�;
- }
-
+ order.LifePayOrderStatus = status;
+ order.ACOOLYStatus = acoolyStatus;
await _lifePayOrderRepository.UpdateAsync(order);
}
@@ -1148,12 +1242,22 @@
var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+ if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
{
return;
}
- if (order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳)
+ if (input.RefundPrice > order.PayAmount)
+ {
+ throw new UserFriendlyException("閫�娆剧殑閲戦涓嶈兘澶т簬瀹炰粯閲戦");
+ }
+
+ if (input.LifePayRefundType == LifePayRefundTypeEnum.鍏ㄩ閫�娆�)
+ {
+ input.RefundPrice = order.PayAmount;
+ }
+
+ if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� || order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayRefundStatus != LifePayRefundStatusEnum.寰呴��娆�)
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
}
@@ -1163,35 +1267,30 @@
switch (order.LifePayType)
{
case LifePayTypeEnum.WxPay:
- var wxRefundResult = await WxPayDomesticRefunds(order.OrderNo, outRefundNo,order.RefundApplyRemark, Convert.ToInt32(order.PayAmount * 100), Convert.ToInt32(order.PayAmount * 100));
+ 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.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
break;
case LifePayTypeEnum.AliPay:
- var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = order.PayAmount.ToString() });
+ 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("閫�娆惧け璐�");
@@ -1201,13 +1300,13 @@
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundTime = DateTime.Now;
order.RefundCheckUserId = CurrentUser.Id;
- order.RefundPrice = order.PayAmount;
+ order.RefundPrice = input.RefundPrice;
await _lifePayOrderRepository.UpdateAsync(order);
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("閫�娆�", "閫�娆�", order.Id);
+ await LifePayOrderHistory("閫�娆�", "閫�娆�", order.Id, (int)OperateHistoryTypeEnum.LifePayRefund);
#endregion
@@ -1228,18 +1327,17 @@
throw new UserFriendlyException("闈炵敤鎴锋湰浜洪��娆�");
}
- if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+ if (order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
{
return;
}
- if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呯‘璁� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐�
- && order.PayStatus != LifePayStatusEnum.宸叉敮浠�)
+ if (order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插畬鎴�)
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曠敵璇烽��娆�");
}
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.RefundApplyRemark = input.RefundApplyRemark;
order.RefundApplyTime = DateTime.Now;
@@ -1362,15 +1460,22 @@
var order = await _lifePayOrderRepository.FirstOrDefaultAsync(x => x.Id == input.Id);
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.PayStatus == LifePayStatusEnum.宸查��娆�)
+ if(order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
{
return;
}
- if ((order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.PayStatus == LifePayStatusEnum.寰呴��娆�) ||
- order.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳 || order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呯‘璁�)
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆�)
{
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
+ }
+ else if (order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�煎け璐�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ }
+
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
@@ -1569,7 +1674,7 @@
order.FinishTime = DateTime.Now;
break;
case ACOOLYConstant.Code.PROCESSING:
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
break;
default:
break;
@@ -1595,6 +1700,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>
/// 鑾峰彇鏀粯浜岀淮鐮�
/// </summary>
--
Gitblit v1.9.1