From fad9a422ecd3a90bec63c9045bf7f23c49452748 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 11 六月 2025 10:28:36 +0800
Subject: [PATCH] fix:修订累计扣款和冻结金额状态
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 4 ++--
LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs | 47 ++++++++++++++++++++++++-----------------------
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 2 +-
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index e08ccf5..b93f77b 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -78,8 +78,8 @@
})
.GetPageResult(input.PageModel);
- var totalDeductionAmount = await _lifePayConsumption.SumAsync(x => x.DeductionAmount);
- var totalFrozenAmount = await _lifePayConsumption.SumAsync(x => x.FrozenAmount);
+ var totalDeductionAmount = await _lifePayConsumption.Where(it => it.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || it.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�).SumAsync(x => x.DeductionAmount);
+ var totalFrozenAmount = await _lifePayConsumption.Where(it => it.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�间腑 || it.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�煎け璐�).SumAsync(x => x.FrozenAmount);
LifePayConsumptionStatistics objectData = new LifePayConsumptionStatistics();
objectData.TotalDeductionAmount = totalDeductionAmount;
objectData.TotalFrozenAmount = totalFrozenAmount ?? 0;
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 3179294..ce9adef 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1390,7 +1390,7 @@
order.ACOOLYOrderNo = result.ACOOLYOrderNo;
order.ACOOLYStatus = ACOOLYStatusEnum.鍏呭�间腑;
await _lifePayOrderRepository.UpdateAsync(order);
- _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
+ _logger.LogInformation("鐢熸椿缂磋垂璁㈠崟锛�" + order.ToJson());
/// 鍒涘缓鐢熸椿缂磋垂娑堣垂璁板綍
await _lifePayOrderService.CreatLifePayConsumption(ACOOLYStatusEnum.鍏呭�间腑, order.OrderNo, order.ACOOLYOrderNo,
diff --git a/LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs b/LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs
index 085423f..b16edd2 100644
--- a/LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs
+++ b/LifePayment/LifePayment.Worker/Worker/CheckUnPayOrderWork.cs
@@ -48,32 +48,33 @@
Logger.LogInformation($"妫�鏌ユ湭鏀粯璁㈠崟鐘舵�佸紑濮�: {DateTime.Now}");
var end = DateTime.Now;
var start = end.AddMinutes(-15);
- var orderNos = lifePayOrderRepository.Where(it => it.PayStatus == LifePayStatusEnum.鏈敮浠� && it.CreationTime >= start && it.CreationTime <= end).Select(it => it.OrderNo).ToList();
- foreach (var orderNo in orderNos)
+ var orders = lifePayOrderRepository.Where(it => it.PayStatus == LifePayStatusEnum.鏈敮浠� && it.CreationTime >= start && it.CreationTime <= end).ToList();
+ foreach (var order in orders)
{
- var wxPayNotice = await lifePayService.WxPayTradeQuery(orderNo);
- var json = wxPayNotice.ToJson();
- Logger.LogInformation($"璁㈠崟锛坽wxPayNotice.OutTradeNo}锛変俊鎭�: {json}");
- if (wxPayNotice.OutTradeNo.Contains("JF") && wxPayNotice.TradeState == LifePaymentConstant.WxPayStatus.鏀粯鎴愬姛)
- {
- await lifePayService.LifePaySuccessHandler(wxPayNotice.OutTradeNo, wxPayNotice.TransactionId);
+ Logger.LogInformation($"璁㈠崟锛歿order.OrderNo}-{order.ToJson()}");
+ //var wxPayNotice = await lifePayService.WxPayTradeQuery(order.OrderNo);
+ //var json = wxPayNotice.ToJson();
+ //Logger.LogInformation($"璁㈠崟锛坽wxPayNotice.OutTradeNo}锛変俊鎭�: {json}");
+ //if (wxPayNotice.OutTradeNo.Contains("JF") && wxPayNotice.TradeState == LifePaymentConstant.WxPayStatus.鏀粯鎴愬姛)
+ //{
+ // await lifePayService.LifePaySuccessHandler(wxPayNotice.OutTradeNo, wxPayNotice.TransactionId);
- // 鎻掑叆鏀舵敮娴佹按
- await lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
- {
- OrderNo = wxPayNotice.OutTradeNo,
- OutOrderNo = wxPayNotice.TransactionId,
- LifePayType = LifePayTypeEnum.WxPay,
- ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
- Amount = wxPayNotice.Amount.Total
- });
+ // // 鎻掑叆鏀舵敮娴佹按
+ // await lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput()
+ // {
+ // OrderNo = wxPayNotice.OutTradeNo,
+ // OutOrderNo = wxPayNotice.TransactionId,
+ // LifePayType = LifePayTypeEnum.WxPay,
+ // ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
+ // Amount = wxPayNotice.Amount.Total
+ // });
- Logger.LogInformation("宸叉敼涓烘敮浠樻垚鍔�");
- }
- else
- {
- Logger.LogInformation("鏈洿鏂�");
- }
+ // Logger.LogInformation("宸叉敼涓烘敮浠樻垚鍔�");
+ //}
+ //else
+ //{
+ // Logger.LogInformation("鏈洿鏂�");
+ //}
}
}
catch (Exception ex)
--
Gitblit v1.9.1