fix: bug

zhengyiming

2025-03-26 67c77f970453ff4d62912060daaf99d2dfc5ed81

 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;
@@ -1124,7 +1124,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.PhoneChargeOrder.BusiOrderNo);
    }
@@ -1155,7 +1155,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.ElectricChargeOrder.BusiOrderNo);
    }
@@ -1183,7 +1183,7 @@
#endif

        CheckExtensions.IfTrueThrowUserFriendlyException(!result.Success || (result.Code != ACOOLYConstant.Code.SUCCESS && result.Code != ACOOLYConstant.Code.PROCESSING),
                                                        "调用ACOOLY接口ConfirmElectricOrder返回错误:" + JsonConvert.SerializeObject(result));
                                                        result.Message);

        return (result.Code, requestInput.RequestNo, result.GasChargeOrder.BusiOrderNo);
    }
@@ -1301,6 +1301,7 @@
            _logger.LogError(ex, "处理生活缴费支付成功回调时异常");
            order.LifePayOrderStatus = LifePayOrderStatusEnum.待退款;
            order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款;
            order.RefundApplyRemark = ex.Message;
        }
        _logger.LogError("生活缴费订单状态：" + order.LifePayOrderStatus.ToString());
        await _lifePayOrderRepository.UpdateAsync(order);
@@ -1570,9 +1571,9 @@
        if (input.LifePayType == LifePayOrderTypeEnum.话费订单)
        {
            var extraProperties = JsonConvert.DeserializeObject<Model_UserAccountExtraProperties>(input.ExtraProperties);
            if (!string.IsNullOrEmpty(extraProperties.Name) && extraProperties.Phone == user.PhoneNumber)
            if (!string.IsNullOrEmpty(extraProperties.Name))
            {
                user.Name = extraProperties.Name;
                user.Name = extraProperties.Phone == user.PhoneNumber ? extraProperties.Name : string.Empty;
            }
        }