fix:bug修复

zhengyuxuan

2025-03-20 946e61a3eec7ee3beb63a70105f47a0cb978791b

fix:bug修复

 LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs

@@ -12,7 +12,7 @@
{


    //Task<ElectricParValueResponse> GetTopStatistics();
    Task<TopStatisticsOutput> GetTopStatistics();

    /// <summary>
    /// 获取电费面值

 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs

@@ -657,10 +657,12 @@
    /// </summary>
    public LifePayStatusEnum PayStatus { get; set; }



    /// <summary>
    /// 订单状态
    /// </summary>
    public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
    public LifePayOrderStatusEnum Status { get; set; }

    /// <summary>
    /// 完成时间
@@ -692,6 +694,11 @@
    public string RefundApplyRemark { get; set; }

    public string RefundCheckRemark { get; set; }

    /// <summary>
    /// 退款订单号
    /// </summary>
    public string? RefundOrderNo { get; set; }

    /// <summary>
    /// 渠道流水号
@@ -807,5 +814,39 @@
    /// </summary>
    public string AccumulatedReceipts { get; set; }

    /// <summary>
    /// 昨日收款
    /// </summary>
    public string ReceiptsYesterda { get; set; }

    /// <summary>
    /// 累计下单
    /// </summary>
    public string AccumulatedOrders { get; set; }

    /// <summary>
    /// 昨日下单
    /// </summary>
    public string OrdersNumYesterda { get; set; }

    /// <summary>
    /// 昨日成功
    /// </summary>
    public string YesterdaSuccess { get; set; }

    /// <summary>
    /// 昨日失败
    /// </summary>
    public string YesterdaFail { get; set; }

    /// <summary>
    /// 累计用户
    /// </summary>
    public string AccumulatedUsers { get; set; }

    /// <summary>
    /// 昨日活跃用户
    /// </summary>
    public string YesterdayActiveUsers { get; set; }

}

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -23,6 +23,8 @@
using static LifePayment.Domain.Shared.LifePaymentConstant;
using ZeroD.Util.Fadd;
using Nest;
using Volo.Abp.Domain.Entities;
using Volo.Abp.ObjectMapping;

namespace LifePayment.Application;

@@ -36,6 +38,7 @@
    private readonly IRepository<LifePayOrder, Guid> _lifePayOrderRepository;
    private readonly IRepository<LifePayUser, Guid> _lifePayUserRepository;
    private readonly IRepository<LifePayIntroInfo, Guid> _lifePayIntroInfoRepository;
    private readonly IRepository<DallyStatistics, Guid> _dallyStatisticsRepository;
    private readonly IRepository<LifePayChannles, Guid> _lifePayChannlesRep;
    private readonly IRepository<LifePayAccount, Guid> _lifePayAccount;
    private readonly IDataFilter dataFilter;
@@ -54,6 +57,7 @@
                          IRepository<LifePayUser, Guid> lifePayUserRepository,
                          IRepository<LifePayPremium, Guid> lifePayPremiumRepository,
                          IRepository<LifePayIntroInfo, Guid> lifePayIntroInfoRepository,
                          IRepository<DallyStatistics, Guid> dallyStatisticsRepository,
                          IAliPayApi aliPayApi,
                          IWxPayApi wxPayApi,
                          IOptions<WxPayOption> wxPayOptions,
@@ -69,6 +73,7 @@
        _lifePayUserRepository = lifePayUserRepository;
        _lifePayPremiumRepository = lifePayPremiumRepository;
        _lifePayIntroInfoRepository = lifePayIntroInfoRepository;
        _dallyStatisticsRepository = dallyStatisticsRepository;
        _aliPayApi = aliPayApi;
        _wxPayApi = wxPayApi;
        _wxPayOptions = wxPayOptions.Value;
@@ -80,6 +85,23 @@
    }

    #region 查询

    public async Task<TopStatisticsOutput> GetTopStatistics()
    {
        var today = DateTime.Now.ToString("yyyy-MM-dd");
        var statistics = await _dallyStatisticsRepository.Where(x => x.CreationTime.ToString("yyyy-MM-dd") == today).FirstOrDefaultAsync();
        if (statistics == null)
        {

            return new TopStatisticsOutput();
        }
        else
        {
            var result = ObjectMapper.Map<DallyStatistics,TopStatisticsOutput>(statistics);
            return result;
        }

    }

    /// <summary>
    /// 获取电费面值
@@ -336,7 +358,7 @@
            Id = order.Id,
            OutOrderNo = order.OutOrderNo,
            LifePayChannle = channle.ChannlesName,
            LifePayOrderStatus = order.LifePayOrderStatus,
            Status = order.LifePayOrderStatus,
            LifePayOrderType = order.LifePayOrderType,
            LifePayType = order.LifePayType,
            OrderNo = order.OrderNo,
@@ -349,6 +371,7 @@
            RefundCheckRemark = order.RefundCheckRemark,
            RefundApplyRemark = order.RefundApplyRemark,
            RefundTime = order.RefundTime,
            RefundOrderNo = order.RefundOrderNo,
            ACOOLYOrderNo = order.ACOOLYOrderNo,
            LifePayRefundStatus = order.LifePayRefundStatus,
            ActualRechargeAmount = order.ActualRechargeAmount,

 LifePayment/LifePayment.Domain/LifePay/DallyStatistics.cs

New file
@@ -0,0 +1,64 @@
using LifePayment.Domain.Shared;
using System;
using Volo.Abp;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Entities.Auditing;

namespace LifePayment.Domain;

public partial class DallyStatistics : Entity<Guid>
{
    public DallyStatistics()
    {
    }

    /// <summary>
    /// 统计时间
    /// </summary>
    public DateTime CreationTime { get; set; }

    /// <summary>
    /// 账户余额
    /// </summary>
    public string Amount { get; set; }

    /// <summary>
    /// 累计收款
    /// </summary>
    public string AccumulatedReceipts { get; set; }

    /// <summary>
    /// 昨日收款
    /// </summary>
    public string ReceiptsYesterda { get; set; }

    /// <summary>
    /// 累计下单
    /// </summary>
    public string AccumulatedOrders { get; set; }

    /// <summary>
    /// 昨日下单
    /// </summary>
    public string OrdersNumYesterda { get; set; }

    /// <summary>
    /// 昨日成功
    /// </summary>
    public string YesterdaSuccess { get; set; }

    /// <summary>
    /// 昨日失败
    /// </summary>
    public string YesterdaFail { get; set; }

    /// <summary>
    /// 累计用户
    /// </summary>
    public string AccumulatedUsers { get; set; }

    /// <summary>
    /// 昨日活跃用户
    /// </summary>
    public string YesterdayActiveUsers { get; set; }
}

 LifePayment/LifePayment.Domain/LifePay/LifePayAccount.cs

@@ -10,6 +10,7 @@
        public LifePayAccount()
        {
        }

        /// <summary>
        /// 用户编号
        /// </summary>

 LifePayment/LifePayment.EntityFrameworkCore/LifePaymentServicesDbContext.cs

@@ -42,6 +42,8 @@

        public virtual DbSet<LifePayAccount> LifePayAccount { get; set; }

        public virtual DbSet<DallyStatistics> DallyStatistics { get; set; }

        [UnitOfWork]
        protected override void OnModelCreating(ModelBuilder builder)
        {

 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs

@@ -39,12 +39,12 @@
        /// 获取顶部统计数据
        /// </summary>
        /// <returns></returns>
        //[HttpGet]
        //[AllowAnonymous]
        //public async Task<TopStatisticsOutput> GetTopStatistics()
        //{
        //    return await _lifePayService.GetTopStatistics();
        //}
        [HttpGet]
        [AllowAnonymous]
        public async Task<TopStatisticsOutput> GetTopStatistics()
        {
            return await _lifePayService.GetTopStatistics();
        }

        /// <summary>
        /// 获取电费面值