From 5d0390cfb35e484427f41d236590f59dddae7e6d Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 26 三月 2025 17:39:11 +0800
Subject: [PATCH] fix:日志
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 8b109ae..0972372 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -402,7 +402,6 @@
var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);
- var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
var orderpirce = await GetOrderPrice(order.RechargeAmount, order.PayAmount, order.PlatformRate, order.ChannleRate, order.ChannlesRakeRate, order.PremiumRate);
@@ -729,7 +728,7 @@
{
DiscountAmount = x.DiscountAmount,
FinishTime = x.FinishTime,
- //LifePayOrderStatus = x.LifePayOrderStatus,
+ LifePayOrderStatus = x.LifePayOrderStatus,
LifePayOrderType = x.LifePayOrderType,
LifePayType = x.LifePayType,
OrderNo = x.OrderNo,
@@ -762,7 +761,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 +1123,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 +1154,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 +1182,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 +1300,7 @@
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
+ order.RefundApplyRemark = ex.Message;
}
_logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
await _lifePayOrderRepository.UpdateAsync(order);
@@ -1654,7 +1654,7 @@
dto.Status = input.Status;
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
+ await LifePayOrderHistory("娓犻亾绠＄悊", "缂栬緫", input.Id.Value, TableType.LifePayChannles);
#endregion
}
@@ -1667,7 +1667,7 @@
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
+ await LifePayOrderHistory("娓犻亾绠＄悊", "鏂板", input.Id.Value, TableType.LifePayChannles);
#endregion
}
@@ -1684,8 +1684,7 @@
#region 璁板綍鏃ュ織
- await PublishLifePayOrderHistoryEvent("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
-
+ await LifePayOrderHistory("娓犻亾绠＄悊", status.GetDescription(), id, TableType.LifePayChannles);
#endregion
}
@@ -1799,10 +1798,10 @@
private (decimal PayAmont, decimal DiscountAmount, decimal RechargeAmount) CalculateAmount(decimal amount, decimal rate)
{
/// 姝ｅ父鏀粯
- //var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
+ var payAmount = decimal.Round(amount * rate / 100, 2, MidpointRounding.AwayFromZero);
/// 1鍒嗛挶鏀粯
- decimal payAmount = 0.01m;
+ //decimal payAmount = 0.01m;
CheckExtensions.IfTrueThrowUserFriendlyException(payAmount < 0.01m, "鏀粯閲戦閿欒");
--
Gitblit v1.9.1