From 4a23824ad9cecb91b9c13a4dd71d4c58355b91ce Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 13:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs | 2 ++
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 2 ++
LifePayment/LifePayment.rar | 0
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 4 ++++
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index bb116ab..d0353ba 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -315,6 +315,8 @@
public decimal ChannlesRate { get; set; }
+ public decimal ChannlesRakeRate { get; set; }
+
public LifePaySwitchTypeEnum SwitchType { get; set; }
public LifePayChannelsStatsEnum Status { get; set; }
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 861b680..df3cda1 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -370,6 +370,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -385,6 +386,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
@@ -1196,6 +1198,7 @@
dto.ChannlesName = input.ChannlesName;
dto.ChannlesNum = input.ChannlesNum;
dto.ChannlesRate = input.ChannlesRate;
+ dto.ChannlesRakeRate = input.ChannlesRakeRate;
dto.SwitchType = input.SwitchType;
dto.ChannlesType = input.ChannlesType;
dto.Status = input.Status;
@@ -1586,6 +1589,7 @@
{
Id = x.Id,
ChannlesRate = x.ChannlesRate,
+ ChannlesRakeRate = x.ChannlesRakeRate,
ChannlesName = x.ChannlesName,
ChannlesNum = x.ChannlesNum,
Status = x.Status,
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs
index 64ee759..e214888 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayChannles.cs
@@ -17,6 +17,8 @@
public decimal ChannlesRate { get; set; }
+ public decimal ChannlesRakeRate { get; set; }
+
public LifePaySwitchTypeEnum SwitchType { get; set; }
public LifePayChannelsStatsEnum Status { get; set; }
diff --git a/LifePayment/LifePayment.rar b/LifePayment/LifePayment.rar
new file mode 100644
index 0000000..9fb2a14
--- /dev/null
+++ b/LifePayment/LifePayment.rar
Binary files differ
--
Gitblit v1.9.1