Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

lingling

2025-03-21 06fd481d0f6f6bb84b09608edc82ccc0c73605f8

Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

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

@@ -620,7 +620,7 @@
    /// <summary>
    /// 手续费比例
    /// </summary>
    public decimal PremiumRate { get; set; }
    public decimal? PremiumRate { get; set; }

    /// <summary>
    /// 手续费

 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -382,8 +382,8 @@
            ChannlesRakeRate = channle.ChannlesRakeRate,
            ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
            PremiumRate = order.PremiumRate,
            PremiumPrice = Math.Round(order.PayAmount * order.PremiumRate, 2),
            Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - Math.Round(order.PayAmount * order.PremiumRate, 2)
            PremiumPrice = Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value:0), 2),
            Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - Math.Round(order.PayAmount * (order.PremiumRate.HasValue ? order.PremiumRate.Value : 0), 2)
        };

        return result;
@@ -1230,7 +1230,7 @@
            order.FinishTime = DateTime.Now;
        }

        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已失败 && order.PayStatus != LifePayStatusEnum.已退款)
        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已失败 && order.LifePayRefundStatus != LifePayRefundStatusEnum.已退款)
        {
            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
        }

 LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs

@@ -186,7 +186,7 @@
        /// <summary>
        /// 手续费比例
        /// </summary>
        public decimal PremiumRate { get; set; }
        public decimal? PremiumRate { get; set; }

    }
}