fix:用户端--我的--数据看板，昨日活跃用户数据统计不正确，统计的是登录账号所配置的渠道中昨日进行充值且充值成功的用户记录

sunpengfei

2025-06-11 87b0ae0a2aca16763bf054c4c785323e36f68387

 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs

@@ -10,6 +10,7 @@
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.DistributedLocking;
using Volo.Abp.Uow;

namespace LifePayment.HttpApi
@@ -20,14 +21,17 @@
    public class ACOOLYNotifyController : AbpController
    {
        private readonly ILifePayService _lifePayService;
        private readonly IAbpDistributedLock distributedLock;
        private readonly ILogger<ACOOLYNotifyController> _logger;

        public ACOOLYNotifyController(
               ILogger<ACOOLYNotifyController> logger,
               ILifePayService lifePayService)
               ILifePayService lifePayService,
               IAbpDistributedLock distributedLock)
        {
            _logger = logger;
            _lifePayService = lifePayService;
            this.distributedLock = distributedLock;
        }

        /// <summary>
@@ -56,6 +60,8 @@
            ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.充值失败;
            var acoolyOrderNo = string.Empty;
            decimal payAmount = 0;
            decimal parValue = 0;
            decimal actualParValue = 0;
            string refundApplyRemark = string.Empty;
            _logger.LogError("ACOOLY回调通处理类型：" + baseInfo.Service);
            _logger.LogError("ACOOLY回调内容：" + body);
@@ -66,6 +72,8 @@
                    orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
                    acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
                    payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount;
                    actualParValue = confirmElectricOrderResponse.ElectricChargeOrder.ActualParValue;
                    parValue = confirmElectricOrderResponse.ElectricChargeOrder.ParValue;
                    _logger.LogError("ACOOLY回调通处理结果状态：" + confirmElectricOrderResponse.ElectricChargeOrder.Status);

                    if (!confirmElectricOrderResponse.Success
@@ -96,13 +104,13 @@
                    else
                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款中)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                        status = LifePayOrderStatusEnum.退款中;
                        acoolyStatus = ACOOLYStatusEnum.退款中;
                    }
                    else
                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款完成)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        status = LifePayOrderStatusEnum.待退款;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                    }
                    else
@@ -116,6 +124,7 @@
                    {
                        status = LifePayOrderStatusEnum.待退款;
                        acoolyStatus = ACOOLYStatusEnum.部分充值成功;
                        refundApplyRemark = confirmElectricOrderResponse.ElectricChargeOrder.ResponseMessage;
                    }
                    break;
                case ACOOLYConstant.Sevice.ConfirmPhoneOrder:
@@ -153,13 +162,13 @@
                    else
                     if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款中)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                        status = LifePayOrderStatusEnum.退款中;
                        acoolyStatus = ACOOLYStatusEnum.退款中;
                    }
                    else
                     if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款完成)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        status = LifePayOrderStatusEnum.待退款;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                    }
                    else
@@ -210,13 +219,13 @@
                    else
                     if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款中)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                        status = LifePayOrderStatusEnum.退款中;
                        acoolyStatus = ACOOLYStatusEnum.退款中;
                    }
                    else
                     if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款完成)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        status = LifePayOrderStatusEnum.待退款;
                        acoolyStatus = ACOOLYStatusEnum.已退款;
                    }
                    else
@@ -236,7 +245,7 @@
                    throw new UserFriendlyException("ACOOLY回调通处理类型不存在");
            }

            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark);
            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark, parValue, actualParValue);
        }
    }
}