diff --git a/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs b/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs
index 6a129faf..70995b1a 100644
--- a/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs
+++ b/YLErpDAL/Modules/ReportModule/SettlementReportModule/SettlementReportFotShanXiService.cs
@@ -121,6 +121,9 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule
///
public (EmailTradeConfirmResultType status, string message) SendSettlementReports(DingShiReportEmail emailData, ClientDingShiReport_ShanXi report, string template, bool IsSkipCheckMarginCall = false, List recevier = null)
{
+ LogFactory.GetLogger().Error("开始发邮件[error]SendSettlementReports");
+ LogFactory.GetLogger().Info("开始发邮件[info]SendSettlementReports");
+ Console.WriteLine("开始发邮件[console]SendSettlementReports");
string message = null;
var attachFiles = new List();
List fileTypes=new List();
@@ -172,7 +175,13 @@ namespace YLErp.Modules.ReportModule.SettlementReportModule
mailFrom = DBCacheManager.Single.GetStr(CacheTable.TradeMarketSendUser);
}
+ LogFactory.GetLogger().Error("开始发邮件[error]SendSettlementReports_start");
+ LogFactory.GetLogger().Info("开始发邮件[info]SendSettlementReports_start");
+ Console.WriteLine("开始发邮件[console]SendSettlementReports_start");
message = EmailHelper.SendMail(string.Join(";", emails), title, detail, true, attachFiles, emailData.CCEmail, mailFrom);
+ LogFactory.GetLogger().Error($"开始发邮件[error]SendSettlementReports_end {message}");
+ LogFactory.GetLogger().Info($"开始发邮件[info]SendSettlementReports_end {message}");
+ Console.WriteLine($"开始发邮件[console]SendSettlementReports_end {message}");
if (!string.IsNullOrEmpty(message))
{
diff --git a/YLErpWeb/Controllers/clientbalanceController.cs b/YLErpWeb/Controllers/clientbalanceController.cs
index 51e55e0a..ff93790a 100644
--- a/YLErpWeb/Controllers/clientbalanceController.cs
+++ b/YLErpWeb/Controllers/clientbalanceController.cs
@@ -235,7 +235,7 @@ namespace YLErp.Web.Controllers
action = "TradeMarketReport_PositionSwapFlow", //Action
clientId = clientId, //参数
startTime = startTime, //参数
- endTime= endTime,
+ endTime = endTime,
});
}
@@ -431,6 +431,9 @@ namespace YLErp.Web.Controllers
[HttpPost]
public async Task GenerateTradeMarketBill2(DingShiReportEmail emailData, string skipOrNot, List receiver, string template = "默认")
{
+ LogFactory.GetLogger().Error("开始发邮件[error]");
+ LogFactory.GetLogger().Info("开始发邮件[info]");
+ Console.WriteLine("开始发邮件[console]");
if (emailData is null)
{
throw new ArgumentNullException(nameof(emailData));
@@ -477,6 +480,9 @@ namespace YLErp.Web.Controllers
{
try
{
+ LogFactory.GetLogger().Error("开始发邮件[error]SendReportMails");
+ LogFactory.GetLogger().Info("开始发邮件[info]SendReportMails");
+ Console.WriteLine("开始发邮件[console]SendReportMails");
EmailTradeConfirmResultType status;
string message;
var report = new SettlementReportFotShanXiService(user).GetReportData(emailData, userAssetUnits, template);
@@ -495,6 +501,10 @@ namespace YLErp.Web.Controllers
}
catch (Exception e)
{
+ LogFactory.GetLogger().Error($"开始发邮件[error]SendSettlementReports_end", e);
+ LogFactory.GetLogger().Info($"开始发邮件[info]SendSettlementReports_end11");
+ Console.WriteLine($"开始发邮件[console]SendSettlementReports_end", e);
+
LogFactory.GetLogger().Error(e, "GenerateTradeMarketBill2");
return JsonError(e.Message == "The number of columns in PdfPTable constructor must be greater than zero." ? "生成的pdf列表的列数必须大于零,请检查配置列不可为空" : e.Message);
}
@@ -591,7 +601,7 @@ namespace YLErp.Web.Controllers
public ViewResult TradeMarketClientSend(int clientid, double payablemargin = -1, double payableFund = -1, string reportType = "", bool ParentFlag = false)
{
var isEodValue = true;
- ViewBag.emails = ClientDataQueryService.GetClientEmails(clientid, false,isEodValue:isEodValue);
+ ViewBag.emails = ClientDataQueryService.GetClientEmails(clientid, false, isEodValue: isEodValue);
ViewBag.TradeMarketSheets = DBCacheManager.Single.GetStr(CacheTable.TradeMarketSheets);
ViewBag.LuoKuanDesc = DBCacheManager.Single.GetStr(CacheTable.LuoKuanDesc);
ViewBag.MarginLuoKuanDesc = DBCacheManager.Single.GetStr(CacheTable.MarginLuoKuanDesc);
@@ -650,12 +660,12 @@ namespace YLErp.Web.Controllers
public JsonResult GetClientAccount(int clientId)
{
var obj = RealtimePnlCalc.GetClientBalance(clientId);
- if (obj==null)
+ if (obj == null)
{
return JsonError("获取资金失败");
}
- return JsonSuccess("",obj);
+ return JsonSuccess("", obj);
}
}
}