shanji 3 years ago
parent
commit
03a3a8eec3
  1. 8
      BBWY.Server.API/NLog.config
  2. 1
      BBWY.Server.API/Startup.cs
  3. 35
      BBWY.Server.Business/NLogManager.cs
  4. 4
      BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
  5. 3
      BBWY.Server.Business/Sync/BaseSyncBusiness.cs
  6. 9
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
  7. 7
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
  8. 7
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
  9. 7
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
  10. 6
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
  11. 2
      BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
  12. 4
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs
  13. 2
      BBWY.Server.Business/Sync/ProductSyncBusiness.cs

8
BBWY.Server.API/NLog.config

@ -1,9 +1,9 @@
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<targets>
<target name="errorFile" xsi:type="File" fileName="${basedir}/logs/error/${shortdate}.txt"
layout="${longdate} | ${level:uppercase=false} ${newline}${message} ${newline}${onexception:${exception:format=tostring} ${newline}${stacktrace} ${newline}${newline}"
autoFlush="true"/>
<target name="infoFile" xsi:type="File" fileName="${basedir}/logs/info/${shortdate}.txt"
<target name="errorFile" xsi:type="File" fileName="${basedir}/logs/${logger}/error/${shortdate}.txt"
layout="${longdate} | ${level:uppercase=false} ${newline}${message} ${newline}${onexception:${exception:format=tostring} ${newline}${stacktrace} ${newline}${newline}"
autoFlush="true"/>
<target name="infoFile" xsi:type="File" fileName="${basedir}/logs/${logger}/info/${shortdate}.txt"
layout="${longdate} | ${level:uppercase=false} ${newline}${message} ${newline}"
autoFlush="true"/>
</targets>

1
BBWY.Server.API/Startup.cs

@ -55,6 +55,7 @@ namespace BBWY.Server.API
MDSfsql = fsql2,
JDXXfsql = fsql3
});
services.AddSingleton<NLogManager>();
services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());
services.AddSingleton<RestApiService>();
services.AddSingleton<TaskSchedulerManager>();

35
BBWY.Server.Business/NLogManager.cs

@ -0,0 +1,35 @@
using NLog;
using System.Collections.Concurrent;
using System.Collections.Generic;
namespace BBWY.Server.Business
{
public class NLogManager
{
private ConcurrentDictionary<string, ILogger> loggerDictionary;
private string defaultLoggerName = "default";
public NLogManager()
{
loggerDictionary = new ConcurrentDictionary<string, ILogger>();
loggerDictionary.TryAdd("default", NLog.LogManager.GetLogger(defaultLoggerName));
}
public ILogger Default()
{
return loggerDictionary[defaultLoggerName];
}
public ILogger GetLogger(string loggerName)
{
if (string.IsNullOrEmpty(loggerName))
return Default();
if (!loggerDictionary.TryGetValue(loggerName, out ILogger logger))
{
logger = NLog.LogManager.GetLogger(loggerName);
loggerDictionary.TryAdd(loggerName, logger);
}
return logger;
}
}
}

4
BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs

@ -29,11 +29,13 @@ namespace BBWY.Server.Business
IOptions<GlobalConfig> options,
ILogger logger,
IFreeSql fsql,
NLogManager logManager,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness,YunDingBusiness yunDingBusiness) : base(restApiService,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
logManager,
fsql,
idGenerator,
taskSchedulerManager,

3
BBWY.Server.Business/Sync/BaseSyncBusiness.cs

@ -14,10 +14,12 @@ namespace BBWY.Server.Business
protected IIdGenerator idGenerator;
protected TaskSchedulerManager taskSchedulerManager;
protected VenderBusiness venderBusiness;
protected NLogManager nLogManager;
public BaseSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -25,6 +27,7 @@ namespace BBWY.Server.Business
YunDingBusiness yunDingBusiness) : base(restApiService, options, yunDingBusiness)
{
this.logger = logger;
this.nLogManager = nLogManager;
this.fsql = fsql;
this.idGenerator = idGenerator;
this.venderBusiness = venderBusiness;

9
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs

@ -22,13 +22,15 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormAdGroupLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
NLogManager nLogManager,
ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness,YunDingBusiness yunDingBusiness) : base(restApiService,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -105,6 +107,9 @@ namespace BBWY.Server.Business.Sync
PageIndex = pageIndex,
Business = 2
}, GetYunDingRequestHeader(), HttpMethod.Post);
nLogManager.GetLogger($"单元维度-{shop.ShopName}").Info(httpResult.Content);
if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception($"获取JD推广报表-单元维度失败 {httpResult.Content}");
@ -118,7 +123,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var data = JsonConvert.SerializeObject(new { shop, startDate, endDate, pageIndex });
logger.Error(ex, $"SyncShopPopularizeReportFormAdGroupLevel Data:{data}");
nLogManager.GetLogger($"单元维度-{shop.ShopName}").Error(ex, $"SyncShopPopularizeReportFormAdGroupLevel Data:{data}");
}
}

7
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs

@ -22,6 +22,7 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormAdLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
NLogManager nLogManager,
ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
@ -29,6 +30,7 @@ namespace BBWY.Server.Business.Sync
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -105,6 +107,9 @@ namespace BBWY.Server.Business.Sync
PageIndex = pageIndex,
Business = 2
}, GetYunDingRequestHeader(), HttpMethod.Post);
nLogManager.GetLogger($"创意维度-{shop.ShopName}").Info(httpResult.Content);
if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception($"获取JD推广报表-创意维度失败 {httpResult.Content}");
@ -118,7 +123,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var data = JsonConvert.SerializeObject(new { shop, startDate, endDate, pageIndex });
logger.Error(ex, $"SyncShopPopularizeReportFormAdLevel Data:{data}");
nLogManager.GetLogger($"创意维度-{shop.ShopName}").Error(ex, $"SyncShopPopularizeReportFormAdLevel Data:{data}");
}
}

7
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs

@ -22,6 +22,7 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormCampaignLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -29,6 +30,7 @@ namespace BBWY.Server.Business.Sync
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -114,6 +116,9 @@ namespace BBWY.Server.Business.Sync
PageIndex = pageIndex,
Business = businessType
}, GetYunDingRequestHeader(), HttpMethod.Post);
nLogManager.GetLogger($"计划维度-{shop.ShopName}-{(businessType == 2 ? "" : "")}").Info(httpResult.Content);
if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception($"获取JD推广报表-计划维度失败 {httpResult.Content}");
@ -127,7 +132,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var data = JsonConvert.SerializeObject(new { shop, startDate, endDate, pageIndex });
logger.Error(ex, $"SyncShopPopularizeReportFormCampaignLevel Data:{data}");
nLogManager.GetLogger($"计划维度-{shop.ShopName}-{(businessType == 2 ? "" : "")}").Error(ex, $"SyncShopPopularizeReportFormCampaignLevel Data:{data}");
}
}

7
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs

@ -23,6 +23,7 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormOrderLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager logManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -30,6 +31,7 @@ namespace BBWY.Server.Business.Sync
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
logManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -116,6 +118,9 @@ namespace BBWY.Server.Business.Sync
PageIndex = pageIndex,
Business = businessType
}, GetYunDingRequestHeader(), HttpMethod.Post);
nLogManager.GetLogger($"订单维度-{shop.ShopName}-{(businessType == 2 ? "" : "")}").Info(httpResult.Content);
if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception($"获取JD推广报表-订单维度失败 {httpResult.Content}");
@ -133,7 +138,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var data = JsonConvert.SerializeObject(new { shop, startDate, endDate, pageIndex });
logger.Error(ex, $"SyncShopPopularizeReportFormOrderLevel Data:{data}");
nLogManager.GetLogger($"订单维度-{shop.ShopName}-{(businessType == 2 ? "" : "")}").Error(ex, $"SyncShopPopularizeReportFormOrderLevel Data:{data}");
}
}

6
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs

@ -22,6 +22,7 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormSkuLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager logManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -29,6 +30,7 @@ namespace BBWY.Server.Business.Sync
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
logManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -111,6 +113,8 @@ namespace BBWY.Server.Business.Sync
PageIndex = pageIndex,
Business = 134217728
}, GetYunDingRequestHeader(), HttpMethod.Post);
nLogManager.GetLogger($"SKU维度-{shop.ShopName}").Info(httpResult.Content);
if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception($"获取JD推广报表-sku维度失败 {httpResult.Content}");
@ -124,7 +128,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var data = JsonConvert.SerializeObject(new { shop, startDate, endDate, pageIndex });
logger.Error(ex, $"SyncShopPopularizeReportFormSkuLevel Data:{data}");
nLogManager.GetLogger($"SKU维度-{shop.ShopName}").Error(ex, $"SyncShopPopularizeReportFormSkuLevel Data:{data}");
}
}

2
BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs

@ -24,6 +24,7 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager nlogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -31,6 +32,7 @@ namespace BBWY.Server.Business.Sync
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nlogManager,
fsql,
idGenerator,
taskSchedulerManager,

4
BBWY.Server.Business/Sync/OrderSyncBusiness.cs

@ -29,6 +29,7 @@ namespace BBWY.Server.Business
public OrderSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager nlogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -37,6 +38,7 @@ namespace BBWY.Server.Business
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nlogManager,
fsql,
idGenerator,
taskSchedulerManager,
@ -516,7 +518,7 @@ namespace BBWY.Server.Business
StorageAmount = purchaseOrder.SingleStorageAmount * deductionQuantity,
IsEnabled = true
};
orderCostDetail.SkuGrossProfit = itemPrice * deductionQuantity -
orderCostDetail.SkuGrossProfit = itemPrice * deductionQuantity -
(orderCostDetail.TotalCost + orderCostDetail.DeliveryExpressFreight);
insertOrderCostDetailList.Add(orderCostDetail);
}

2
BBWY.Server.Business/Sync/ProductSyncBusiness.cs

@ -22,6 +22,7 @@ namespace BBWY.Server.Business.Sync
public ProductSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@ -30,6 +31,7 @@ namespace BBWY.Server.Business.Sync
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,
taskSchedulerManager,

Loading…
Cancel
Save