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.Worker/Worker/CheckUnPayOrderWork.cs |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

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