From 5e918c353d039a75f552f4eb0cc251e96ef809ab Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 01 四月 2025 09:58:54 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 499e20d..1ea346a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -29,6 +29,7 @@
using StackExchange.Redis;
using static Volo.Abp.Identity.Settings.IdentitySettingNames;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using LifePayment.Application.LifePay;
namespace LifePayment.Application;
@@ -47,6 +48,7 @@
private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
private readonly IRepository<OperateHistory, Guid> _operateHistory;
private readonly IRepository<LifePayChannlesRake, Guid> _lifePayChannlesRakeRepository;
+ private readonly ILifePayOrderService _lifePayOrderService;
private readonly IDataFilter dataFilter;
private readonly IChannelFilter _channelFilter;
private readonly IAliPayApi _aliPayApi;
@@ -67,6 +69,7 @@
IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
IRepository<LifePayChannlesRake, Guid> lifePayChannlesRakeRepository,
IRepository<OperateHistory, Guid> operateHistory,
+ ILifePayOrderService lifePayOrderService,
IAliPayApi aliPayApi,
IAlipayInterfaceManager aliPayInterfaceManager,
IWxPayApi wxPayApi,
@@ -86,6 +89,7 @@
_lifePayPremiumRepository = lifePayPremiumRepository;
_lifePayIntroInfoRepository = lifePayIntroInfoRepository;
_aliPayApi = aliPayApi;
+ _lifePayOrderService = lifePayOrderService;
_alipayInterfaceManager = aliPayInterfaceManager;
_wxPayApi = wxPayApi;
_wxPayOptions = wxPayOptions.Value;
@@ -844,12 +848,20 @@
/// <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();
+ input.OutRefundNo = order.RefundOrderNo;
+ var result = await _aliPayApi.QueryAlipayTradeRefund(input);
if (result.Code == AlipayResultCode.Success && result.RefundStatus == AlipayRefundStatus.Success)
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ {
+ OrderNo = order.RefundOrderNo,
+ OutOrderNo = result.TradeNo,
+ LifePayType = LifePayTypeEnum.AliPay,
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
+ });
}
return result;
@@ -1351,7 +1363,7 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.宸插畬鎴�)
{
return;
}
@@ -1431,7 +1443,6 @@
}
var outRefundNo = order.ChannelId + CreateRefundOrderNo();
- order.RefundOrderNo = outRefundNo;
switch (order.LifePayType)
{
case LifePayTypeEnum.WxPay:
@@ -1460,12 +1471,13 @@
throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
}
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
break;
default: throw new UserFriendlyException("閫�娆惧け璐�");
}
+ order.RefundOrderNo = outRefundNo;
order.RefundCredentialsImgUrl = input.RefundCredentialsImgUrl;
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundTime = DateTime.Now;
--
Gitblit v1.9.1