diff --git a/Framework/YLErp.Core/DBModels/SwapRate.cs b/Framework/YLErp.Core/DBModels/SwapRate.cs
index dc4625f4..04aa3850 100644
--- a/Framework/YLErp.Core/DBModels/SwapRate.cs
+++ b/Framework/YLErp.Core/DBModels/SwapRate.cs
@@ -99,31 +99,31 @@ namespace YLErp.DBModels
///
/// 前台费用
///
- [DisplayName("前台费用")]
- [Column("front_desk_charge")]
- [DataChange]
- public decimal? FrontDeskCharge { get; set; }
+ //[DisplayName("前台费用")]
+ //[Column("front_desk_charge")]
+ //[DataChange]
+ //public decimal? FrontDeskCharge { get; set; }
///
/// 前台费用万分比
///
- [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;
///
/// 前台费用
///
- [DisplayName("前台费用")]
- [Column("back_desk_charge")]
- [DataChange]
- public decimal? BackDeskCharge { get; set; }
+ //[DisplayName("前台费用")]
+ //[Column("back_desk_charge")]
+ //[DataChange]
+ //public decimal? BackDeskCharge { get; set; }
///
/// 后台费用万分比
///
- [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;
///
/// 线下协商费率
diff --git a/YLErpDAL/Modules/SwapModule/SwapRateService.cs b/YLErpDAL/Modules/SwapModule/SwapRateService.cs
index 2d3b2b60..9d2da793 100644
--- a/YLErpDAL/Modules/SwapModule/SwapRateService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapRateService.cs
@@ -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;