From 7860180b74c5094a5df16680fbfbf7a33b2032cd Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 14:12:10 +0800
Subject: [PATCH] fix:状态更新
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 3a173b6..9ac81e1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -152,6 +152,16 @@
}
/// <summary>
+ /// 鑾峰彇娓犻亾鎶樻墸
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ChannelRateOutput> GetChannelRate(ChannelsBaseInput input)
+ {
+ return _lifePayChannlesRep.Where(x => x.IsDeleted == false && x.ChannlesNum == input.CheckChannelId).Select(x => new ChannelRateOutput() { ChannlesRate = x.ChannlesRate })
+ .FirstOrDefault();
+ }
+
+ /// <summary>
/// 鑾峰彇鎵嬬画璐硅垂鐜�
/// </summary>
/// <returns></returns>
@@ -298,7 +308,7 @@
.WhereIf(input.BeginRefundApplyTime.HasValue, x => x.RefundApplyTime >= input.BeginRefundApplyTime)
.WhereIf(input.LifePayType.HasValue, x => x.LifePayType == input.LifePayType)
.WhereIf(input.EndRefundApplyTime.HasValue, x => x.RefundApplyTime <= input.EndRefundApplyTime)
- .WhereIf(input.LifePayOrderStatus.HasValue, x => x.LifePayOrderStatus == input.LifePayOrderStatus.Value)
+ .WhereIf(input.LifePayRefundStatus.HasValue, x => x.LifePayRefundStatus == input.LifePayRefundStatus.Value)
.WhereIf(input.ACOOLYStatus.HasValue, x => x.ACOOLYStatus == input.ACOOLYStatus.Value)
.WhereIf(input.LifePayOrderType.HasValue, x => x.LifePayOrderType == input.LifePayOrderType.Value)
.WhereIf(input.UserId.HasValue, x => x.UserId == input.UserId.Value)
@@ -1327,12 +1337,16 @@
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
}
+ else if (wxRefundResult.Message == "璁㈠崟宸插叏棰濋��娆�")
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
+ }
else
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
-
break;
case LifePayTypeEnum.AliPay:
var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice * 100).ToString() });
@@ -1351,7 +1365,7 @@
order.RefundCheckUserId = CurrentUser.Id;
order.RefundPrice = input.RefundPrice;
- await _lifePayOrderRepository.UpdateAsync(order);
+ //await _lifePayOrderRepository.UpdateAsync(order);
#region 璁板綍鏃ュ織
@@ -1390,6 +1404,10 @@
await _lifePayOrderRepository.UpdateAsync(order);
}
+ else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.宸查��娆�)
+ {
+ throw new UserFriendlyException("褰撳墠璁㈠崟鏃犳硶閲嶅鐢宠閫�娆�");
+ }
else
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曠敵璇烽��娆�");
@@ -1411,7 +1429,7 @@
{
OutTradeNo = outTradeNo,
OutRefundNo = outRefundNo,
- Reason = reason,
+ //Reason = reason,
Amount = new Model_WxPayDomesticRefunds_Amount
{
Refund = refund,
@@ -1475,7 +1493,7 @@
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.Name;
}
--
Gitblit v1.9.1