From 7b77ac597eaacf2618a85d9506e918a4052201c0 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 14:30:52 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 2
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 141 ++++++++++++++++++++++++++++++++++++++++++++++
LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs | 1
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 1
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 7 ++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 7 +
6 files changed, 155 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index b9f5cef..c9fe4a2 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -293,6 +293,7 @@
public string RefundCheckRemark { get; set; }
}
+
public class RefundUserLifePayOrderInput : ChannelsBaseInput
{
public Guid Id { get; set; }
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index b6de771..96fcfd4 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -587,6 +587,8 @@
/// 鎵嬬画璐�
/// </summary>
public decimal PremiumPrice { get; set; }
+
+ public decimal? Profit { get; set; }
}
public class CreateLifePayOrderOutput
diff --git a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
index 89d0e22..2dbdc47 100644
--- a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
@@ -15,6 +15,7 @@
/// 鎵嬫満鍙�
/// </summary>
public string PhoneNumber { get; set; }
+ public string Password { get; set; }
/// <summary>
/// 璐︽埛
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 0a8d5cf..bbba5e5 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -271,6 +271,7 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.渚涘簲鍟嗘姌鎵ｄ环);
var channleRate = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
+ var premiumRate = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
var result = new LifePayOrderOutput()
{
@@ -299,8 +300,10 @@
PlatformPrice = order.PlatformDeductionAmount,
ChannleRate = channleRate.ChannlesRate,
ChannlesRakeRate = channleRate.ChannlesRakeRate,
- ChannlesRakePrice = (order.PayAmount - order.PlatformDeductionAmount) * channleRate.ChannlesRakeRate,
- //PremiumRate =
+ ChannlesRakePrice = (order.PayAmount - order.PlatformDeductionAmount) * channleRate.ChannlesRakeRate / 100,
+ PremiumRate = premiumRate == null ? default : premiumRate.Rate,
+ PremiumPrice = premiumRate == null ? default : Math.Round(order.PayAmount * premiumRate.Rate, 2),
+ Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channleRate.ChannlesRakeRate / 100) - (premiumRate == null ? 0 : Math.Round(order.PayAmount * premiumRate.Rate, 2))
};
return result;
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index d63ca45..760101a 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -124,6 +124,13 @@
<param name="input"></param>
<returns></returns>
</member>
+ <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayOrderDetail(System.String)">
+ <summary>
+ 鑾峰彇璁㈠崟璇︽儏
+ </summary>
+ <param name="orderNo"></param>
+ <returns></returns>
+ </member>
<member name="M:LifePayment.HttpApi.LifePayController.GetUserLifePayOrderPage(LifePayment.Application.Contracts.QueryLifePayOrderListInput)">
<summary>
鑾峰彇鎴戠殑璁㈠崟鍒嗛〉鏁版嵁
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 1374b1f..586c9cb 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -177,6 +177,13 @@
<param name="input"></param>
<returns></returns>
</member>
+ <member name="M:LifePayment.Application.Contracts.ILifePayService.GetLifePayOrderDetail(System.String)">
+ <summary>
+ 鑾峰彇璁㈠崟璇︽儏
+ </summary>
+ <param name="orderNo"></param>
+ <returns></returns>
+ </member>
<member name="M:LifePayment.Application.Contracts.ILifePayService.GetPayStatusByOrderNo(System.String)">
<summary>
鏍规嵁璁㈠崟鍙疯幏鍙栨敮浠樼姸鎬�
@@ -695,12 +702,17 @@
</member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYOrderNo">
<summary>
- 骞冲彴璁㈠崟鍙�
+ 渚涘簲鍟嗚鍗曞彿
</summary>
</member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ACOOLYStatus">
<summary>
- 渚涘簲鍟�
+ 渚涘簲鍟嗚鍗曠姸鎬�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.LifePayRefundStatus">
+ <summary>
+ 骞冲彴閫�娆剧姸鎬�
</summary>
</member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.CreationTime">
@@ -818,6 +830,131 @@
娓犻亾娴佹按鍙�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayType">
+ <summary>
+ 鐢熸椿缂磋垂鏀粯绫诲瀷
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayOrderType">
+ <summary>
+ 璁㈠崟绫诲瀷
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderNo">
+ <summary>
+ 璁㈠崟鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RechargeAmount">
+ <summary>
+ 鍏呭�奸噾棰�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.DiscountAmount">
+ <summary>
+ 浼樻儬閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayAmount">
+ <summary>
+ 瀹炰粯閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayTime">
+ <summary>
+ 鏀粯鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PayStatus">
+ <summary>
+ 鏀粯鐘舵��
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayOrderStatus">
+ <summary>
+ 璁㈠崟鐘舵��
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.FinishTime">
+ <summary>
+ 瀹屾垚鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderParamDetailJsonStr">
+ <summary>
+ 璁㈠崟璇︾粏鏁版嵁
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.CreationTime">
+ <summary>
+ 涓嬪崟鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundTime">
+ <summary>
+ 閫�娆炬椂闂�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundCredentialsImgUrl">
+ <summary>
+ 閫�娆惧嚟璇�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ACOOLYOrderNo">
+ <summary>
+ 娓犻亾娴佹按鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayRefundStatus">
+ <summary>
+ 骞冲彴閫�娆剧姸鎬�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ActualRechargeAmount">
+ <summary>
+ 瀹為檯鍏呭�奸噾棰�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundPrice">
+ <summary>
+ 閫�娆鹃噾棰�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PlatformRate">
+ <summary>
+ 骞冲彴鎶樻墸姣斾緥
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PlatformPrice">
+ <summary>
+ 骞冲彴鎵ｆ閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannleRate">
+ <summary>
+ 娓犻亾鎶樻墸
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannlesRakeRate">
+ <summary>
+ 娓犻亾浣ｉ噾姣斾緥
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ChannlesRakePrice">
+ <summary>
+ 娓犻亾浣ｉ噾
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PremiumRate">
+ <summary>
+ 鎵嬬画璐规瘮渚�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.PremiumPrice">
+ <summary>
+ 鎵嬬画璐�
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id">
<summary>
璁㈠崟缂栧彿
--
Gitblit v1.9.1