From 87095b4a2d3e342f4374423b22d90f0ed6557a7d Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 02 四月 2025 14:45:32 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs | 7 ++++++-
LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs | 2 +-
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 2 +-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
index 7c02e77..cef804e 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayOrderService.cs
@@ -380,6 +380,10 @@
}
}
+ /// <summary>
+ /// 缁熻鎵�鏈夋敹鏀祦姘�
+ /// </summary>
+ /// <returns></returns>
public async Task GetAllLifePayExpensesReceipts()
{
var orderlist = await (from a in _lifePayOrderRepository.Where(x => x.PayStatus >= LifePayStatusEnum.宸叉敮浠�)
@@ -433,7 +437,8 @@
/// 姣涘埄
var grossProfit = item.RechargeAmount * (item.ChannleRate - item.PlatformRate) / 100;
/// 娓犻亾浣ｉ噾 锛�(鍏呭�奸潰棰� * 娓犻亾鎶樻墸姣斾緥)-(鍏呭�奸潰棰� * 骞冲彴鎶樻墸姣斾緥)锛�* 浣ｉ噾姣斾緥
- var channlesRakePrice = grossProfit * (item.ChannlesRakeRate) / 100;
+ var channlesRakePrice = grossProfit * item.ChannlesRakeRate / 100;
+
if (channlesRakePrice.HasValue)
{
LifePayChannlesRake lifePayChannlesRake = new LifePayChannlesRake()
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 4321135..44722cc 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -609,7 +609,7 @@
public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList()
{
- return await GetLifePayChannlesListFilter().Where(x => x.Status == LifePayChannelsStatsEnum.鍚敤).ToListAsync();
+ return await GetLifePayChannlesListFilter().ToListAsync();
}
public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index 0975667..47f543b 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -353,7 +353,7 @@
</member>
<member name="M:LifePayment.HttpApi.LifePayController.GetAllChannlesRake">
<summary>
- 鍚屾璁㈠崟
+ 鍚屾璁㈠崟鍒嗕剑淇℃伅
</summary>
<returns></returns>
</member>
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
index e25aba2..138a122 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -621,7 +621,7 @@
}
/// <summary>
- /// 鍚屾璁㈠崟
+ /// 鍚屾璁㈠崟鍒嗕剑淇℃伅
/// </summary>
/// <returns></returns>
[HttpGet]
--
Gitblit v1.9.1