From 5644f6870d55da5c7f38ae1e975fa37831390225 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 17:55:10 +0800
Subject: [PATCH] fix bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 5 ++++-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 6 ++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index 16a691b..138de31 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -224,7 +224,9 @@
/// <summary>
/// 骞冲彴鎶樻墸姣斾緥
/// </summary>
- public decimal? PlatformRate { get; set; }
+ public decimal PlatformRate { get; set; }
+
+ public decimal PlatformDeductionAmount { get; set; }
/// <summary>
/// 娓犻亾鎶樻墸
@@ -241,6 +243,7 @@
/// </summary>
public decimal PremiumRate { get; set; }
+
}
//public class ChannelsBaseInput : PageInput
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 06231b6..585f463 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -850,8 +850,10 @@
RechargeAmount = amount.RechargeAmount,
ChannelId = channle.ChannlesNum,
PlatformRate = platformRate.Rate,
+ PlatformDeductionAmount = amount.RechargeAmount * platformRate.Rate /100,
ChannleRate = channle.ChannlesRate,
ChannlesRakeRate = channle.ChannlesRakeRate,
+ //ChannlesRakePrice = amount.RechargeAmount * (channle.ChannlesRate - platformRate.Rate) / 100 * channle.ChannlesRakeRate / 100
};
await CreateLifePayOrder(orderInput);
@@ -1273,6 +1275,7 @@
{
case LifePayRefundStatusEnum.宸查��娆�:
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.ACOOLYStatus = ACOOLYStatusEnum.宸查��娆�;
break;
case LifePayRefundStatusEnum.閫�娆句腑:
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
@@ -1370,6 +1373,7 @@
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() });
@@ -1377,7 +1381,9 @@
{
throw new UserFriendlyException("閫�娆惧け璐�");
}
+
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
break;
default: throw new UserFriendlyException("閫�娆惧け璐�");
}
--
Gitblit v1.9.1