fix: bug

zhengyiming

3 天以前 83b72e32a89988dd721ef7bc8ea673751092fb4a

fix: bug

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

@@ -911,12 +911,12 @@
    /// <summary>
    /// 退款申请时间
    /// </summary>
    public DateTime RefundTime { get; set; }
    public DateTime? RefundTime { get; set; }

    /// <summary>
    /// 退款成功时间
    /// </summary>
    public DateTime RefundSuccessTime { get; set; }
    public DateTime? RefundSuccessTime { get; set; }

    public RefundPlatformStatusEnum RefundPlatformStatus { get; set; }


 LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs

@@ -357,9 +357,9 @@
                result.RefundOrderNo = order.RefundOrderNo;
                result.OutOrderNo = query.TradeNo;
                result.LifePayType = LifePayTypeEnum.AliPay;
                result.RefundTime = Convert.ToDateTime(order.RefundTime);
                result.RefundSuccessTime = Convert.ToDateTime(query.GmtRefundPay);
                result.RefundPlatformStatus = MapWxpayRefundStatusToPlatformEnum(query.RefundStatus);
                result.RefundTime = order.RefundTime;
                result.RefundSuccessTime = query.GmtRefundPay.IsNullOrEmpty() ? null : Convert.ToDateTime(query.GmtRefundPay);
                result.RefundPlatformStatus = MapAlipayRefundStatusToPlatformEnum(query.RefundStatus);
            }
            else if (order.LifePayType == LifePayTypeEnum.WxPay)
            {
@@ -368,8 +368,8 @@
                result.RefundOrderNo = order.RefundOrderNo;
                result.OutOrderNo = query.TransactionId;
                result.LifePayType = LifePayTypeEnum.WxPay;
                result.RefundTime = Convert.ToDateTime(query.CreateTime);
                result.RefundSuccessTime = Convert.ToDateTime(query.SuccessTime);
                result.RefundTime = query.CreateTime.IsNullOrEmpty() ? null : Convert.ToDateTime(query.CreateTime);
                result.RefundSuccessTime = query.SuccessTime.IsNullOrEmpty() ? null : Convert.ToDateTime(query.SuccessTime);
                result.RefundPlatformStatus = MapWxpayRefundStatusToPlatformEnum(query.Status);
            }


 LifePayment/LifePayment.Application/LifePay/LifePayService.cs

@@ -1595,7 +1595,7 @@
                return;
            }

            if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已退款)
            if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已退款 || order.LifePayOrderStatus == LifePayOrderStatusEnum.退款中)
            {
                _logger.LogInformation($"订单已退款,不在处理");
                return;