fix:bug修复

zhengyuxuan

2025-03-31 0dfdacf054c5d9539a12da3f97402b1cf45ffb77

fix:bug修复

 LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayOrderService.cs

@@ -15,6 +15,7 @@
    Task<PageOutput<LifePayExpensesReceiptsListOutput>> GetLifePayExpensesReceiptsPage(LifePayExpensesReceiptsPageInput input);

    Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input);
    Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input);

    Task AddUpdatePayRechargeReceipts(AddUpdatePayRechargeReceiptsInput input);


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

@@ -1315,4 +1315,12 @@
    /// 下单渠道
    /// </summary>
    public string ChannelId { get; set; }
}
public class LifePayChannlesRakeListTemplate
{
    [Name("序号")]
    public int SerialNumber { get; set; }

    [Name("手机号")]
    public string PhoneNumber { get; set; }
}

 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -117,7 +117,7 @@
        public async Task<PageOutput<LifePayChannlesRakeListOutput>> GetLifePayChannlesRakePage(LifePayChannlesRakePageInput input)
        {
            var list = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
                .WhereIf(input.ChannelId != null, x => x.ChannelId == input.ChannelId)
                .WhereIf(input.ChannelId.IsNotNullOrEmpty(), x => x.ChannelId == input.ChannelId)
                .WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
                .WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
                .WhereIf(input.FinishTimeBegin.HasValue, x => x.FinishTime >= input.FinishTimeBegin)
@@ -144,6 +144,51 @@
            return list;
        }

        public async Task<List<LifePayChannlesRakeListTemplate>> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input)
        {
            //var result = await (await GetLifePayOrderListFilter(input)).Select(x => new LifePayOrderListTemplate
            //{
            //    DiscountAmount = x.DiscountAmount,
            //    FinishTime = x.FinishTime,
            //    LifePayOrderStatus = x.LifePayOrderStatus,
            //    LifePayOrderType = x.LifePayOrderType,
            //    LifePayType = x.LifePayType,
            //    OrderNo = x.OrderNo,
            //    PayAmount = x.PayAmount,
            //    ActualRechargeAmount = x.RechargeAmount,
            //    PhoneNumber = x.PhoneNumber,
            //    RechargeAmount = x.RechargeAmount,
            //    OutOrderNo = x.OutOrderNo,
            //    PayStatus = x.PayStatus,
            //    PayTime = x.PayTime,
            //    ACOOLYOrderNo = x.ACOOLYOrderNo,
            //    CreationTime = x.CreationTime,
            //    LifePayRefundStatus = x.LifePayRefundStatus,
            //    ACOOLYStatus = x.ACOOLYStatus,
            //    //RefundApplyRemark = x.RefundApplyRemark,
            //    ChannelName = x.ChannelName,
            //    PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0.00m
            //}).OrderByDescending(r => r.CreationTime).ToListAsync();
            //var i = 0;
            //result.ForEach(s =>
            //{
            //    s.SerialNumber = ++i;
            //    s.LifePayOrderTypeStr = s.LifePayOrderType.GetDescription();
            //    s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
            //    s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
            //    s.PayAmountStr = s.PayAmount.ToString("F2");
            //    s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
            //    s.LifePayTypeStr = s.LifePayType.GetDescription();
            //    s.PayStatusStr = s.PayStatus.GetDescription();
            //    s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
            //    s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.无需退款 ? "" : s.LifePayRefundStatus.GetDescription();
            //    s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
            //    s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
            //    s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
            //});
            return null;
        }

        #endregion



 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -274,6 +274,13 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayChannlesRakePageExport(LifePayment.Application.Contracts.LifePayChannlesRakePageInput)">
            <summary>
            导出渠道分佣Excel
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayExpensesReceiptsPage(LifePayment.Application.Contracts.LifePayExpensesReceiptsPageInput)">
            <summary>
            获取收支流水分页数据

 LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs

@@ -454,6 +454,22 @@
        }

        /// <summary>
        /// 导出渠道分佣Excel
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<ActionResult> GetLifePayChannlesRakePageExport(LifePayChannlesRakePageInput input)
        {
            var data = await _lifePayOrderService.GetLifePayChannlesRakePageExport(input);
            if (data.Any())
            {
                var bytes = ExcelHelper.ListToByteForExcel(data, "xlsx");
                return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "渠道分佣" + ".xlsx");
            }
            return Json(default);
        }
        /// <summary>
        /// 获取收支流水分页数据
        /// </summary>
        /// <param name="input"></param>