fix:bug修复

zhengyuxuan

2025-03-21 8b923699a5ff894ca839b4b5ce79979d5dd20459

fix:bug修复

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

@@ -246,6 +246,12 @@
    /// </summary>
    public string RefundApplyRemark { get; set; }


    /// <summary>
    /// 退款申请时间
    /// </summary>
    public DateTime? RefundApplyTime { get; set; }

    /// <summary>
    /// 驳回原因
    /// </summary>
@@ -615,6 +621,11 @@
    /// 平台利润
    /// </summary>
    public decimal? Profit { get; set; }

    /// <summary>
    /// 回单地址
    /// </summary>
    public string? ElecBillUrl { get; set; }
}
public class LifePayRefundOrderOutput
{
@@ -740,6 +751,12 @@
    /// 退款金额
    /// </summary>
    public decimal? RefundPrice { get; set; }


    /// <summary>
    /// 回单地址
    /// </summary>
    public string? ElecBillUrl { get; set; }
}
public class CreateLifePayOrderOutput
{

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -358,6 +358,7 @@
                                CreationTime = a.CreationTime,
                                RefundCheckRemark = a.RefundCheckRemark,
                                RefundApplyRemark = a.RefundApplyRemark,
                                RefundApplyTime = a.RefundApplyTime,
                                RefundTime = a.RefundTime,
                                ChannelName = b.ChannlesName,
                                ActualRechargeAmount = a.ActualRechargeAmount,
@@ -408,6 +409,7 @@
            RefundPrice = order.RefundPrice,
            PlatformRate = platformRate.Rate,
            PlatformPrice = order.PlatformDeductionAmount,
            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
            ChannleRate = channle.ChannlesRate,
            ChannlesRakeRate = channle.ChannlesRakeRate,
            ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
@@ -457,6 +459,7 @@
            LifePayRefundStatus = order.LifePayRefundStatus,
            ActualRechargeAmount = order.ActualRechargeAmount,
            RefundPrice = order.RefundPrice,
            ElecBillUrl = order.ElecBillUrl.GetOssPath(),
        };

        return result;
@@ -737,7 +740,7 @@
                var elecInfoInput = new DataBillErceiptApplyInput
                {
                    Type = "FUND_DETAIL",
                    Key = orderNo
                    Key = order.OutOrderNo
                };

                var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);

 LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs

@@ -23,8 +23,8 @@
        //internal const string FundBatchDetailQuery = "alipay.fund.batch.detail.query";
        //internal const string FundBatchOrderChanged = "alipay.fund.batch.order.changed";
        //internal const string FundAccountQuery = "alipay.fund.account.query";
        internal const string DataBillErceiptApply = "alipay.data.bill.ereceiptagent.apply";
        internal const string DataBillEreceiptQuery = "alipay.data.bill.accountbookereceipt.query";
        internal const string DataBillErceiptApply = "alipay.data.bill.ereceipt.apply";
        internal const string DataBillEreceiptQuery = "alipay.data.bill.ereceipt.query";
        internal const string DataDataserviceBillDownloadUrlQuery = "alipay.data.dataservice.bill.downloadurl.query";



 LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs

@@ -151,5 +151,10 @@
        /// 平台退款状态
        /// </summary>
        public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }

        /// <summary>
        /// 回单地址
        /// </summary>
        public string? ElecBillUrl { get; set; }
    }
}

 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -132,7 +132,7 @@
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayRefundOrderPage(LifePayment.Application.Contracts.QueryLifePayRefundOrderListInput)">
            <summary>
            获取订单分页数据
            获取退款订单分页数据
            </summary>
            <param name="input"></param>
            <returns></returns>

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

@@ -1045,6 +1045,11 @@
            平台利润
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ElecBillUrl">
            <summary>
            回单地址
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.UserPhoneNumber">
            <summary>
            用户账号
@@ -1160,6 +1165,11 @@
            退款金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ElecBillUrl">
            <summary>
            回单地址
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id">
            <summary>
            订单编号

 LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs

@@ -58,6 +58,10 @@
                    await _lifePayService.LifePaySuccessHandler(input.OutTradeNo, input.TradeNo);
                }
            }
            else
            {
                   _logger.LogError($"生活管家支付宝充值回调通知：订单号异常 "+ input.OutTradeNo);
            }

            return new ContentResult
            {