生活缴费api
parent: eb1da8e8 | 补丁 | 提交 | ignore whitespace
zhengyuxuan
2025-03-24 e8f296f3017d46efb1018b8d8270c8db75c961d4 
fix；bug修复
4个文件已修改
67 ■■■■■ 已修改文件
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Application/LifePay/LifePayService.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs


@@ -153,7 +153,7 @@


    /// <summary>


    /// 用户手机号


    /// </summary>


    public string PhoneNumber { get; set; }


    public string? PhoneNumber { get; set; }




    /// <summary>


    /// 生活缴费支付类型


@@ -163,7 +163,7 @@


    /// <summary>


    /// 渠道名称


    /// </summary>


    public string ChannelName { get; set; }


    public string? ChannelName { get; set; }




    /// <summary>


    /// 订单类型


@@ -178,7 +178,7 @@


    /// <summary>


    /// 退款订单号


    /// </summary>


    public string RefundOrderNo { get; set; }


    public string? RefundOrderNo { get; set; }




    /// <summary>


    /// 充值金额


@@ -281,6 +281,13 @@


    /// 平台退款状态


    /// </summary>


    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }




    /// <summary>


    /// 实际到账金额


    /// </summary>


    public decimal ActualReceivedAmount { get; set; }




    public LifePayStatusEnum? ActualReceivedStatus { get; set; }


}




public class LifePayOrderListTemplate


@@ -389,26 +396,26 @@


{




    [Name("序号")]


    public int SerialNumber { get; set; }


    public int? SerialNumber { get; set; }




    [Name("手机号")]


    public string PhoneNumber { get; set; }


    public string? PhoneNumber { get; set; }




    public LifePayTypeEnum? LifePayType { get; set; }




    public LifePayOrderTypeEnum LifePayOrderType { get; set; }


    public LifePayOrderTypeEnum? LifePayOrderType { get; set; }




    [Name("充值类型")]


    public string LifePayOrderTypeStr { get; set; }


    public string? LifePayOrderTypeStr { get; set; }




    [Name("充值渠道")]


    public string ChannelName { get; set; }


    public string? ChannelName { get; set; }




    /// <summary>


    /// 退款申请时间


    /// </summary>


    [Name("申请退款时间")]


    public string RefundApplyTimeStr { get; set; }


    public string? RefundApplyTimeStr { get; set; }




    /// <summary>


    /// 下单时间


@@ -416,14 +423,14 @@


    public DateTime CreationTime { get; set; }




    [Name("下单时间")]


    public string CreationTimeStr { get; set; }


    public string? CreationTimeStr { get; set; }




    [Name("退款订单号")]


    public string RefundOrderNo { get; set; }


    public string? RefundOrderNo { get; set; }






    [Name("充值金额")]


    public string RechargeAmountStr { get; set; }


    public string? RechargeAmountStr { get; set; }






    /// <summary>


@@ -435,7 +442,7 @@


    /// 实际到账金额


    /// </summary>


    [Name("实际到账金额")]


    public string ActualReceivedAmount { get; set; }


    public string? ActualReceivedAmount { get; set; }




    /// <summary>


    /// 实付金额


@@ -443,7 +450,7 @@


    public decimal PayAmount { get; set; }




    [Name("实付金额")]


    public string PayAmountStr { get; set; }


    public string? PayAmountStr { get; set; }




    [Name("退款渠道")]


    public string LifePayTypeStr { get; set; }


@@ -455,13 +462,13 @@


    public decimal? RefundPrice { get; set; }






    public ACOOLYStatusEnum ACOOLYStatus { get; set; }


    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }




    /// <summary>


    /// 供应商订单状态


    /// </summary>


    [Name("供应商订单状态")]


    public string ACOOLYStatusStr { get; set; }


    public string? ACOOLYStatusStr { get; set; }






    /// <summary>


@@ -473,11 +480,13 @@


    /// <summary>


    /// 平台退款状态


    /// </summary>


    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }




    [Name("平台退款状态")]


    public string LifePayRefundStatus { get; set; }


    public string? LifePayRefundStatusStr { get; set; }




    [Name("完成时间")]


    public string FinishTimeStr { get; set; }


    public string? FinishTimeStr { get; set; }






}




 LifePayment/LifePayment.Application/LifePay/LifePayService.cs


@@ -356,8 +356,6 @@


    /// <returns></returns>


    public async Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)


    {




     


        var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate


        {


            FinishTime = x.FinishTime,


@@ -367,7 +365,13 @@


            PayAmount = x.PayAmount,


            PhoneNumber = x.PhoneNumber,


            RefundOrderNo = x.RefundOrderNo,


            ChannelName = x.ChannelName


            ChannelName = x.ChannelName,


            CreationTime = x.CreationTime,


            ACOOLYStatus = x.ACOOLYStatus,


            RechargeAmount = x.RechargeAmount,


            ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),


            LifePayRefundStatus = x.LifePayRefundStatus,




        }).OrderByDescending(r => r.CreationTime).ToListAsync();


        var i = 0;


        result.ForEach(s =>


@@ -378,7 +382,7 @@


            s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);


            s.RechargeAmountStr = s.RechargeAmount.ToString("F2");


            s.ActualReceivedAmount = s.ActualReceivedAmount;


            s.LifePayRefundStatus = s.LifePayRefundStatus.GetDescription();


            s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();


            s.PayAmountStr = s.PayAmount.ToString("F2");


            s.LifePayTypeStr = s.LifePayType.GetDescription();


            s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);


@@ -2015,6 +2019,7 @@


                                PlatformDeductionAmount = a.PlatformDeductionAmount,


                                ACOOLYStatus = a.ACOOLYStatus,


                                LifePayRefundStatus = a.LifePayRefundStatus,


                                ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0


                            });


        return result;


    }




 LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs


@@ -165,6 +165,10 @@


    /// <returns></returns>


    public static string GetDescription(this object value)


    {


        if (value==null)


        {


            return null;


        }


        return value.GetType().GetMember(value.ToString() ?? string.Empty).FirstOrDefault()


                             ?.GetCustomAttribute<DescriptionAttribute>()?.Description;


    }




 LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml


@@ -841,6 +841,11 @@


            平台退款状态


            </summary>


        </member>


        <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ActualReceivedAmount">


            <summary>


            实际到账金额


            </summary>


        </member>


        <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.CreationTime">


            <summary>


            下单时间