Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 去掉前后台费用逻辑

Browse Source
This commit is contained in:
zheng.zhang
2025-12-29 09:30:44 +08:00
parent 4774983990
commit 3867c0cf8f
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/YLErp.Core/DBModels/SwapRate.cs
+14 -14
View File
@@ -99,31 +99,31 @@ namespace YLErp.DBModels
/// <summary>
/// 前台费用
/// </summary>
[DisplayName("前台费用")]
[Column("front_desk_charge")]
[DataChange]
public decimal? FrontDeskCharge { get; set; }
//[DisplayName("前台费用")]
//[Column("front_desk_charge")]
//[DataChange]
//public decimal? FrontDeskCharge { get; set; }
/// <summary>
/// 前台费用万分比
/// </summary>
[DisplayName("前台费用万分比")]
[Column("front_desk_charge_is_percent")]
public bool? FrontDeskChargeIsPercent { get; set; } = true;
//[DisplayName("前台费用万分比")]
//[Column("front_desk_charge_is_percent")]
//public bool? FrontDeskChargeIsPercent { get; set; } = true;
/// <summary>
/// 前台费用
/// </summary>
[DisplayName("前台费用")]
[Column("back_desk_charge")]
[DataChange]
public decimal? BackDeskCharge { get; set; }
//[DisplayName("前台费用")]
//[Column("back_desk_charge")]
//[DataChange]
//public decimal? BackDeskCharge { get; set; }
/// <summary>
/// 后台费用万分比
/// </summary>
[DisplayName("后台费用万分比")]
[Column("back_desk_charge_is_percent")]
public bool? BackDeskChargeIsPercent { get; set; } = true;
//[DisplayName("后台费用万分比")]
//[Column("back_desk_charge_is_percent")]
//public bool? BackDeskChargeIsPercent { get; set; } = true;
/// <summary>
/// 线下协商费率
YLErpDAL/Modules/SwapModule/SwapRateService.cs
+32 -32
View File
@@ -106,10 +106,10 @@ namespace YLErp.Modules.SwapModule
swapRate.DiscountAccDown = req.DiscountAccDown;
swapRate.DiscountRateIsPercent = req.DiscountRateIsPercent;
swapRate.DiscountRate = req.DiscountRate;
swapRate.FrontDeskCharge = req.FrontDeskCharge;
swapRate.FrontDeskChargeIsPercent = req.FrontDeskChargeIsPercent;
swapRate.BackDeskCharge = req.BackDeskCharge;
swapRate.BackDeskChargeIsPercent = req.BackDeskChargeIsPercent;
// swapRate.FrontDeskCharge = req.FrontDeskCharge;
// swapRate.FrontDeskChargeIsPercent = req.FrontDeskChargeIsPercent;
// swapRate.BackDeskCharge = req.BackDeskCharge;
// swapRate.BackDeskChargeIsPercent = req.BackDeskChargeIsPercent;
swapRate.OfflineRate = req.OfflineRate;
swapRate.SetOpt(UserId, UserName);
}
@@ -279,29 +279,29 @@ namespace YLErp.Modules.SwapModule
}
swapRate.DiscountRate = rate;
}
var frontRate = reader.GetString("现券对冲交易费用");
if (!string.IsNullOrEmpty(frontRate))
{
if (frontRate.EndsWith("‱"))
{
swapRate.FrontDeskChargeIsPercent = true;
frontRate = frontRate.Replace("‱", "");
}
//var frontRate = reader.GetString("现券对冲交易费用");
//if (!string.IsNullOrEmpty(frontRate))
//{
// if (frontRate.EndsWith("‱"))
// {
// swapRate.FrontDeskChargeIsPercent = true;
// frontRate = frontRate.Replace("‱", "");
// }
decimal.TryParse(frontRate, out var rate);
swapRate.FrontDeskCharge = rate * 0.0001m;
}
var backRate = reader.GetString("现券对冲结算费用");
if (!string.IsNullOrEmpty(backRate))
{
if (backRate.EndsWith("‱"))
{
swapRate.BackDeskChargeIsPercent = true;
backRate = backRate.Replace("‱", "");
}
decimal.TryParse(backRate, out var rate);
swapRate.BackDeskCharge = rate * 0.0001m;
}
// decimal.TryParse(frontRate, out var rate);
// swapRate.FrontDeskCharge = rate * 0.0001m;
//}
//var backRate = reader.GetString("现券对冲结算费用");
//if (!string.IsNullOrEmpty(backRate))
//{
// if (backRate.EndsWith("‱"))
// {
// swapRate.BackDeskChargeIsPercent = true;
// backRate = backRate.Replace("‱", "");
// }
// decimal.TryParse(backRate, out var rate);
// swapRate.BackDeskCharge = rate * 0.0001m;
//}
swapRate.DiscountAccDown = reader.GetDecimal("优惠累计量下限");
ValidateSwapRate(swapRate);
swapRate.SetCreator(UserId, UserName);
@@ -344,8 +344,8 @@ namespace YLErp.Modules.SwapModule
exportModel.TempRate = item.TempRateIsPercent ? item.TempRate.OtcFormatPercent(4) : item.TempRate.OtcFormatMoney(true);
exportModel.DiscountRate = item.DiscountRateIsPercent ? item.DiscountRate.OtcFormatPercent(4) : item.DiscountRate.OtcFormatMoney(true);
exportModel.DiscountAccDown = item.DiscountAccDown.OtcFormatMoney(true);
exportModel.FrontDeskCharge = item.FrontDeskChargeIsPercent == true ? item.FrontDeskCharge.OtcFormatTenThousandsPercent(4) : item.FrontDeskCharge.OtcFormatMoney(true);
exportModel.BackDeskCharge = item.BackDeskChargeIsPercent == true ? item.BackDeskCharge.OtcFormatTenThousandsPercent(4) : item.BackDeskCharge.OtcFormatMoney(true);
//exportModel.FrontDeskCharge = item.FrontDeskChargeIsPercent == true ? item.FrontDeskCharge.OtcFormatTenThousandsPercent(4) : item.FrontDeskCharge.OtcFormatMoney(true);
//exportModel.BackDeskCharge = item.BackDeskChargeIsPercent == true ? item.BackDeskCharge.OtcFormatTenThousandsPercent(4) : item.BackDeskCharge.OtcFormatMoney(true);
exportModel.OfflineRate = item.OfflineRate.OtcFormatPercent(4);
list.Add(exportModel);
}
@@ -437,10 +437,10 @@ namespace YLErp.Modules.SwapModule
{
SwapRateKafkaModel swapRateKafkaModel = new SwapRateKafkaModel();
swapRateKafkaModel.clientId = swapRate.ClientId;
swapRateKafkaModel.frontDeskCharge = swapRate.FrontDeskCharge ?? 0;
swapRateKafkaModel.isFrontDeskChargePercent = swapRate.FrontDeskChargeIsPercent ?? true;
swapRateKafkaModel.backDeskCharge = swapRate.BackDeskCharge ?? 0;
swapRateKafkaModel.isBackDeskChargePercent = swapRate.BackDeskChargeIsPercent ?? true;
//swapRateKafkaModel.frontDeskCharge = swapRate.FrontDeskCharge ?? 0;
//swapRateKafkaModel.isFrontDeskChargePercent = swapRate.FrontDeskChargeIsPercent ?? true;
//swapRateKafkaModel.backDeskCharge = swapRate.BackDeskCharge ?? 0;
//swapRateKafkaModel.isBackDeskChargePercent = swapRate.BackDeskChargeIsPercent ?? true;
if (swapRate.TempRate.HasValue)
{
swapRateKafkaModel.isRate = swapRate.TempRateIsPercent;