From fc5fc5bcb84ad464638008768932e47ad36c36af Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 18:22:53 +0800
Subject: [PATCH] fix:提交
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 2 +-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 8 ++++----
LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs | 6 ++----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index a9dcccd..eee8553 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -240,7 +240,7 @@
{
data.ExtraProperties = JsonConvert.SerializeObject(query);
data.FinishTime = Convert.ToDateTime(query.SendPayDate);
- data.Amount = Convert.ToDecimal(query.PayAmount);
+ data.Amount = Convert.ToDecimal(query.TotalAmount);
await _lifePayExpensesReceiptsRepository.InsertAsync(data);
}
}
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 5bae261..499e20d 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1351,10 +1351,10 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- //{
- // return;
- //}
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴� || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ {
+ return;
+ }
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
index e5b41c0..0d20883 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
@@ -64,8 +64,7 @@
await _lifePayService.LifePaySuccessHandler(input.OutTradeNo, input.TradeNo);
// 鎻掑叆鏀舵敮娴佹按
await _lifePayOrderService.AddLifePayExpensesReceipts(new AddLifePayExpensesReceiptsInput() { OrderNo = input.OutTradeNo,
- OutOrderNo = input.TradeNo ,LifePayType = LifePayTypeEnum.AliPay,ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses,
- Amount = input.ReceiptAmount.Value });
+ OutOrderNo = input.TradeNo ,LifePayType = LifePayTypeEnum.AliPay,ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Expenses });
}
else if((input.TradeStatus == LifePaymentConstant.AliPayStatus.鏀粯鎴愬姛 && input.OutBizNo.IsNotNullOrEmpty() && input.RefundFee.HasValue) ||
input.TradeStatus == LifePaymentConstant.AliPayStatus.瓒呮椂鍏抽棴)
@@ -77,8 +76,7 @@
OrderNo = input.OutTradeNo,
OutOrderNo = input.TradeNo,
LifePayType = LifePayTypeEnum.AliPay,
- ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts,
- Amount = input.ReceiptAmount.Value
+ ExpensesReceiptsType = ExpensesReceiptsTypeEnum.Receipts
});
}
}
--
Gitblit v1.9.1