From edbf9166fc8857f192adade7e15d8f7d52de4b91 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 12 六月 2025 11:13:19 +0800
Subject: [PATCH] fix:bug
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 5581eb3..637ff94 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -23,6 +23,7 @@
using Volo.Abp.EventBus.Distributed;
using Z.EntityFramework.Plus;
using ZeroD.Util;
+using ZeroD.Util.Fadd;
using static LifePayment.Domain.Shared.LifePaymentConstant;
namespace LifePayment.Application;
@@ -1536,6 +1537,7 @@
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
await using var orderLock = await distributedLock.TryAcquireAsync($"LockKey:UpdateOrder:{orderNo}", TimeSpan.FromSeconds(60));
+ _logger.LogInformation($"閿侊細LockKey:UpdateOrder:{orderNo} - {orderLock != null}");
if (order.ACOOLYStatus.HasValue && (int)order.ACOOLYStatus > (int)acoolyStatus)
{
@@ -1866,10 +1868,19 @@
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆�)
{
+ if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�兼垚鍔�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
+ order.LifePayRefundStatus = null;
+ }
+ else
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ }
+
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
- order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
await _lifePayOrderRepository.UpdateAsync(order);
@@ -2342,7 +2353,7 @@
.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))
+ .WhereIf(input.KeyWords.IsNotNullOrEmpty(), x => x.PhoneNumber.Contains(input.KeyWords) || x.RefundOrderNo.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
--
Gitblit v1.9.1