diff --git a/Framework/YLErp.Core/DBModels/SwapRate.cs b/Framework/YLErp.Core/DBModels/SwapRate.cs
index dcb39bf4..dc4625f4 100644
--- a/Framework/YLErp.Core/DBModels/SwapRate.cs
+++ b/Framework/YLErp.Core/DBModels/SwapRate.cs
@@ -124,5 +124,13 @@ namespace YLErp.DBModels
[DisplayName("后台费用万分比")]
[Column("back_desk_charge_is_percent")]
public bool? BackDeskChargeIsPercent { get; set; } = true;
+
+ ///
+ /// 线下协商费率
+ ///
+ [DisplayName("线下费率")]
+ [Column("off_line_rate")]
+ [DataChange]
+ public decimal? OfflineRate { get; set; }
}
}
diff --git a/YLErpDAL/Model/SwapRateExportModel.cs b/YLErpDAL/Model/SwapRateExportModel.cs
index 535484ac..28ba220d 100644
--- a/YLErpDAL/Model/SwapRateExportModel.cs
+++ b/YLErpDAL/Model/SwapRateExportModel.cs
@@ -20,5 +20,6 @@ namespace YLErp.Model
public string FrontDeskCharge { get; set; }
public string BackDeskCharge { get; set; }
+ public string OfflineRate { get; set; }
}
}
diff --git a/YLErpDAL/Modules/SwapModule/SwapRateService.cs b/YLErpDAL/Modules/SwapModule/SwapRateService.cs
index bea46af2..6100ccb9 100644
--- a/YLErpDAL/Modules/SwapModule/SwapRateService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapRateService.cs
@@ -110,6 +110,7 @@ namespace YLErp.Modules.SwapModule
swapRate.FrontDeskChargeIsPercent = req.FrontDeskChargeIsPercent;
swapRate.BackDeskCharge = req.BackDeskCharge;
swapRate.BackDeskChargeIsPercent = req.BackDeskChargeIsPercent;
+ swapRate.OfflineRate = req.OfflineRate;
swapRate.SetOpt(UserId, UserName);
}
else
@@ -345,6 +346,7 @@ namespace YLErp.Modules.SwapModule
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.OfflineRate = item.OfflineRate.OtcFormatTenThousandsPercent(4);
list.Add(exportModel);
}
var tplFilePath = OtcAppContext.MapPath("/App_Docs");
diff --git a/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx b/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx
index fd6df59c..1cf1d83a 100644
Binary files a/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx and b/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx differ
diff --git a/YLErpWeb/Views/SwapRate/Detail.cshtml b/YLErpWeb/Views/SwapRate/Detail.cshtml
index 9480df1b..f2244aa4 100644
--- a/YLErpWeb/Views/SwapRate/Detail.cshtml
+++ b/YLErpWeb/Views/SwapRate/Detail.cshtml
@@ -72,6 +72,10 @@
优惠累计量下限 |
@Model.DiscountAccDown.OtcFormatMoney(true) |
+
+ | 线下费率 |
+ @Model.OfflineRate.OtcFormatPercent(4) |
+
diff --git a/YLErpWeb/Views/SwapRate/Edit.cshtml b/YLErpWeb/Views/SwapRate/Edit.cshtml
index 358d6331..68ae2a18 100644
--- a/YLErpWeb/Views/SwapRate/Edit.cshtml
+++ b/YLErpWeb/Views/SwapRate/Edit.cshtml
@@ -73,6 +73,11 @@
*
+