fix:bug修复

zhengyuxuan

2025-03-20 7b77ac597eaacf2618a85d9506e918a4052201c0

fix:bug修复

 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs

@@ -293,6 +293,7 @@

    public string RefundCheckRemark { get; set; }
}

public class RefundUserLifePayOrderInput : ChannelsBaseInput
{
    public Guid Id { get; set; }

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

@@ -587,6 +587,8 @@
    /// 手续费
    /// </summary>
    public decimal PremiumPrice { get; set; }

    public decimal? Profit { get; set; }
}

public class CreateLifePayOrderOutput

 LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs

@@ -15,6 +15,7 @@
        /// 手机号
        /// </summary>
        public string PhoneNumber { get; set; }
        public string Password { get; set; }

        /// <summary>
        /// 账户

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -271,6 +271,7 @@
        var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
        var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);
        var channleRate = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
        var premiumRate = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
        CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
        var result = new LifePayOrderOutput()
                {
@@ -299,8 +300,10 @@
            PlatformPrice = order.PlatformDeductionAmount,
            ChannleRate = channleRate.ChannlesRate,
            ChannlesRakeRate = channleRate.ChannlesRakeRate,
            ChannlesRakePrice = (order.PayAmount - order.PlatformDeductionAmount) * channleRate.ChannlesRakeRate,
            //PremiumRate = 
            ChannlesRakePrice = (order.PayAmount - order.PlatformDeductionAmount) * channleRate.ChannlesRakeRate / 100,
            PremiumRate = premiumRate == null ? default : premiumRate.Rate,
            PremiumPrice = premiumRate == null ? default : Math.Round(order.PayAmount * premiumRate.Rate, 2),
            Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channleRate.ChannlesRakeRate / 100) - (premiumRate == null ? 0 : Math.Round(order.PayAmount * premiumRate.Rate, 2))
        };

        return result;

 LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml

@@ -124,6 +124,13 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayOrderDetail(System.String)">
            <summary>
            获取订单详情
            </summary>
            <param name="orderNo"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.HttpApi.LifePayController.GetUserLifePayOrderPage(LifePayment.Application.Contracts.QueryLifePayOrderListInput)">
            <summary>
            获取我的订单分页数据

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

@@ -177,6 +177,13 @@
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetLifePayOrderDetail(System.String)">
            <summary>
            获取订单详情
            </summary>
            <param name="orderNo"></param>
            <returns></returns>
        </member>
        <member name="M:LifePayment.Application.Contracts.ILifePayService.GetPayStatusByOrderNo(System.String)">
            <summary>
            根据订单号获取支付状态
@@ -695,12 +702,17 @@
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYOrderNo">
            <summary>
            平台订单号
            供应商订单号
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYStatus">
            <summary>
            供应商
            供应商订单状态
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.LifePayRefundStatus">
            <summary>
            平台退款状态
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.CreationTime">
@@ -818,6 +830,131 @@
            渠道流水号
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayType">
            <summary>
            生活缴费支付类型
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayOrderType">
            <summary>
            订单类型
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderNo">
            <summary>
            订单号
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RechargeAmount">
            <summary>
            充值金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.DiscountAmount">
            <summary>
            优惠金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayAmount">
            <summary>
            实付金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayTime">
            <summary>
            支付时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayStatus">
            <summary>
            支付状态
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayOrderStatus">
            <summary>
            订单状态
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.FinishTime">
            <summary>
            完成时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderParamDetailJsonStr">
            <summary>
            订单详细数据
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.CreationTime">
            <summary>
            下单时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundTime">
            <summary>
            退款时间
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundCredentialsImgUrl">
            <summary>
            退款凭证
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ACOOLYOrderNo">
            <summary>
            渠道流水号
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayRefundStatus">
            <summary>
            平台退款状态
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ActualRechargeAmount">
            <summary>
            实际充值金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundPrice">
            <summary>
            退款金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PlatformRate">
            <summary>
            平台折扣比例
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PlatformPrice">
            <summary>
            平台扣款金额
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannleRate">
            <summary>
            渠道折扣
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannlesRakeRate">
            <summary>
            渠道佣金比例
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannlesRakePrice">
            <summary>
            渠道佣金
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PremiumRate">
            <summary>
            手续费比例
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PremiumPrice">
            <summary>
            手续费
            </summary>
        </member>
        <member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id">
            <summary>
            订单编号