fix:修订累计扣款和冻结金额状态

sunpengfei

2025-06-11 fad9a422ecd3a90bec63c9045bf7f23c49452748

fix:修订累计扣款和冻结金额状态

 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;

 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,

 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)