From c7164e5a28ae8615842bf7325257803bd9f8c3c9 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 三月 2025 11:36:18 +0800
Subject: [PATCH] fix: bug

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 597e1a6..b7ac615 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -729,7 +729,7 @@
         {
             DiscountAmount = x.DiscountAmount,
             FinishTime = x.FinishTime,
-            //LifePayOrderStatus = x.LifePayOrderStatus,
+            LifePayOrderStatus = x.LifePayOrderStatus,
             LifePayOrderType = x.LifePayOrderType,
             LifePayType = x.LifePayType,
             OrderNo = x.OrderNo,
@@ -762,7 +762,7 @@
             s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
             s.LifePayRefundStatusStr = s.LifePayRefundStatus == LifePayRefundStatusEnum.鏃犻渶閫�娆� ? "" : s.LifePayRefundStatus.GetDescription();
             s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
-            //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
+            s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
             s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmmss);
         });
         return result;
@@ -1571,9 +1571,9 @@
         if (input.LifePayType == LifePayOrderTypeEnum.璇濊垂璁㈠崟)
         {
             var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
-            if (!string.IsNullOrEmpty(extraProperties.Name))
+            if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
             {
-                user.Name = extraProperties.Phone == user.PhoneNumber ? extraProperties.Name : string.Empty;
+                user.Name = extraProperties.Name;
             }
         }
 

--
Gitblit v1.9.1