Skip to content

D
DataCenter_Core2.1_20190520
Commit 89b35511 by guanzhenshan
Options

Merge branch 'master' of http://193.112.143.129/bltdc/DataCenter_Core2.1_20190520

parents 5325b960 d2e5009e
Showing with 313 additions and 2 deletions
Bailun.DC.Web/Areas/Logistics/Controllers/HomeController.cs
......@@ -141,6 +141,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
/// </summary>
/// <param name="start"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【数据分析】->【EbayUK平邮比例】->【查询】页面", 0)]
public string EbayUkReportJson(Models.BtTableParameter request, DateTime start, DateTime end, int? l_start, int? l_end, int? bg_start, int? bg_end)
{
var service = new Services.OrdersServices();
......
Bailun.DC.Web/Areas/Reports/Controllers/AllotController.cs
......@@ -16,7 +16,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
return View();
}
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【调拨单(调拨在途明细】->【查询】页面", 0)]
public string ListAllotJson(BtTableParameter parameter, string warehouse, int? status, string orderno, string sku)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
......@@ -43,6 +43,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【资产负债表】->【查询】页面", 0)]
public JsonResult IndexJson(int type, int paycompanyvalue, DateTime? day)
{
var date = DateTime.Now;
......@@ -480,6 +481,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【资产负债表】->【任务运行情况】->【查询】页面", 0)]
public JsonResult BalanceSheetTaskJson(DateTime day)
{
if (day > DateTime.Now.AddDays(-1))
......@@ -595,6 +597,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【管理成本报表】->【查询】页面", 0)]
public JsonResult AdministrativeCostJson(int t, DateTime start,DateTime end,int? paycompanyid)
{
var url = ConfigHelper.GetByName("FeeUrl")+"?o=0";
......@@ -3146,6 +3149,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【资产负债表】->【环比报表】->【查询】页面", 0)]
public JsonResult FinanceDebtChainChartJson(DateTime start, DateTime end)
{
try
......@@ -4025,6 +4029,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【平台余额】->【查询】页面", 0)]
public string ListAccoutBalanceCountJson(BtTableParameter request, DateTime day, string platformname)
{
var user = HttpContextHelper.Current?.User;
......@@ -4402,6 +4407,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 每日销售额统计
/// </summary>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【每日销售额】->【查询】页面", 0)]
public string DailySalesCountJson(BtTableParameter request, DateTime day, string platformcode)
{
var services = new Services.FinanceReportServices();
......@@ -4678,6 +4684,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="dateWay">统计方式 1按日 2按周 3按月</param>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【每日发生额汇总】->【查询】页面", 0)]
public JsonResult HappenAmountCountJson(DateTime start, DateTime end,int dateWay)
{
var list = new List<mHappenAmount>();
......@@ -7130,6 +7137,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【跨境电商现金流报告】->【查询】页面", 0)]
public JsonResult ListDailyCompanyMoneyJson(DateTime start, DateTime end)
{
try
......@@ -7222,6 +7230,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">期初时间</param>
/// <param name="end">期末时间</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【成品仓库进销存】->【查询】页面", 0)]
public string WHPurchaseSellStockJson(BtTableParameter parameter, string warehousetype, string warehouse, DateTime start, DateTime end)
{
var total = 0;
......@@ -7309,6 +7318,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">期初日期</param>
/// <param name="end">期末日期</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【成品SKU进销存】->【查询】页面", 0)]
public string SkuPurchaseSellStockJson(BtTableParameter parameter, string sku,string warehousetype, string warehouse, DateTime start, DateTime end)
{
var _service = new Services.FinanceReportServices();
......@@ -7391,6 +7401,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">期初时间</param>
/// <param name="end">期末时间</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【半成品仓库进销存报表】->【查询】页面", 0)]
public string SemiWHPurchaseSellStockJson(BtTableParameter parameter, string warehousetype, string warehouse, DateTime start, DateTime end)
{
var total = 0;
......@@ -7482,6 +7493,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">期初日期</param>
/// <param name="end">期末日期</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【半成品SKU进销存】->【查询】页面", 0)]
public string SemiSkuPurchaseSellStockJson(BtTableParameter parameter, string sku, string warehousetype, string warehouse, DateTime start, DateTime end)
{
var _service = new Services.FinanceReportServices();
......@@ -7558,7 +7570,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
{
return View();
}
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【AliExpress】->【速卖通充值记录】->【查询】页面", 0)]
public string AliExpressChargeJson(BtTableParameter parameter, string account, DateTime? start, DateTime? end)
{
var total = 0;
......@@ -7591,6 +7603,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【分平台利润统计】->【AliExpress】->【速卖通充值记录】->【导入】操作", 1)]
public JsonResult UploadAliExpressCharge()
{
if (Request.Form.Files.Count == 0)
......@@ -7724,6 +7737,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">结束月份</param>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【月度销售利润统计】->【查询】页面", 0)]
public JsonResult ListMonthSaleProfit(string month)
{
var _service = new Services.FinanceReportServices();
......@@ -8074,6 +8088,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">结束时间</param>
/// <param name="platform">平台类型</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【平台应收账款】->【搜索】页面", 0)]
public string PlatformReceivableJson(BtTableParameter parameter, DateTime start, DateTime end, string platform,int type)
{
var total = 0;
......@@ -8178,6 +8193,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【进销存差异汇总】->【搜索】页面", 0)]
public JsonResult UnReasonableJson(string month)
{
if (string.IsNullOrEmpty(month))
......@@ -8291,6 +8307,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="isaims">是否aims下单</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【每月进销存合理报表】->【搜索】页面", 0)]
public string ListUnReasonableJson(BtTableParameter parameter, string month, string warehousetype,string warehouse,int? type,int? isclear,int? isnew,int? isaims,string category, int isreasonable = -1)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/InventoryController.cs
......@@ -119,6 +119,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【数据仓】->【查询】页面",0)]
public JsonResult DataWareHouseCountJson(Models.BtTableParameter request, string warehousetype, int? areaid, string warehousecode, DateTime? start, DateTime? end, int? monitorstatus, int? cleanstatus, int? infringestatus, string skutip, int? storestart, int? storeend, int? skucategory, string searchkey, string skucategoryids, string groupname,string skubrand)
{
var service = new Services.SkuMonitorServices();
......@@ -269,6 +270,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="groupname"></param>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【库存】->【库存周转报表】->【数据仓】->【设置分组】操作", 1)]
public JsonResult SaveGroupName(string s,string groupname)
{
if (string.IsNullOrWhiteSpace(groupname))
......@@ -302,6 +304,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// 上传Sku分组文件
/// </summary>
/// <returns></returns>
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【库存】->【库存周转报表】->【数据仓】->【上传分组文件】操作", 1)]
public JsonResult UploadSkuGroup()
{
if (Request.Form.Files.Count == 0)
......@@ -414,6 +417,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start">开发开始时间</param>
/// <param name="end">开发结束时间</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【数据仓销售分析】->【查询】页面", 0)]
public string WarehouseSaleReportJson(Models.BtTableParameter parameter,string warehousetype,string warehousecode,int? startcount,int? endcount,DateTime? devstart,DateTime? devend,DateTime? start,DateTime? end)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/LogisticsController.cs
......@@ -41,6 +41,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="suppliername">供应商名称</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【物流供应商往来】->【搜索】页面", 0)]
public string SupplierTrancationReportJson(BtTableParameter request,DateTime start,DateTime end,string suppliername)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/OnWayController.cs
......@@ -134,6 +134,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【调拨计划在途明细】->【查询】页面", 0)]
public string AllotPlanJson(BtTableParameter parameter, string orderno, string sku, string warehousetype, string warehousecode)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs
......@@ -46,6 +46,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【平台费流水】->【查询】页面", 0)]
public string ListPlatformCostJson(BtTableParameter parameter, string platform, DateTime? start, DateTime? end,string website,string account,string warehousetype,string warehousecode,string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User.GetCompanyId().ToInt32();
......@@ -208,6 +209,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="currency">币种</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【非FBA销售统计】->【查询】页面", 0)]
public string ListAmazonSaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string warehousetype, string warehousecode,string skucategoryids,string currency)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -302,6 +304,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">结束时间</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【FBA销售统计】->【查询】页面", 0)]
public string ListFBASaleStatisticsJson(BtTableParameter parameter, string sellaccount, string website, DateTime start, DateTime end,string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -414,6 +417,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="sku">sku编码</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【订单流水】->【查询】页面", 0)]
public string ListOrderJson(BtTableParameter parameter, string platform, string account, string website, DateTime? start, DateTime? end,string orderno,string sku,string skucategoryids,decimal? rate_start,decimal? rate_end)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -511,6 +515,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="orderno"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【财务费用】->【查询】页面", 0)]
public string FinanceFeeJson(BtTableParameter parameter, string platform, int feetype, int feecharacter, string account, DateTime? start, DateTime? end, string orderno)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -594,6 +599,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end">付款结束时间</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【FBA异常订单】->【查询】页面", 0)]
public string FBAabnormalOrderJson(BtTableParameter parameter, string account, string website, string orderno, DateTime? start, DateTime? end,string skucategoryids)
{
......@@ -643,6 +649,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【平台费异常订单】->【查询】页面", 0)]
public string PlatformFeeAbnormalJson(BtTableParameter parameter,string platform,string account,string website,string orderno,DateTime? start,DateTime? end,string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -703,6 +710,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="sku">sku编码</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【非FBA销售订单】->【查询】页面", 0)]
public string SkuOrderListJson(BtTableParameter parameter, string warehousetype, string warehousecode,string seller,DateTime? start,DateTime? end, string orderstatus, string shippingstatus, string orderno, string sku,int isfba)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -730,6 +738,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// </summary>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【订单汇总】->【查询】页面", 0)]
public string OrderSaleCountJson(BtTableParameter parameter,string platform,string account,string website,string warehousecode, DateTime? start,DateTime? end,string sku)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -768,6 +777,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousecode"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【Ebay销售统计】->【查询】页面", 0)]
public string EbaySaleStatisticsJson(BtTableParameter parameter, string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode,string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -998,6 +1008,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="sku">sku编码</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【已发货订单流水】->【查询】页面", 0)]
public string ListEbayOrderJson(BtTableParameter parameter, string account, string website, DateTime? start, DateTime? end, string orderno, string sku,string itemid,string skucategoryid, decimal? rate_start, decimal? rate_end)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -1130,6 +1141,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【上架费列表】->【查询】页面", 0)]
public string EbayPutAwayFeeJson(BtTableParameter parameter,DateTime? start,DateTime? end,string orderno,string sku,string skucategoryid,string account)
{
var _service = new Services.OrdersServices();
......@@ -1213,6 +1225,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="skucategoryid"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【Ebay广告费】->【查询】页面", 0)]
public string EbayADFeeJson(BtTableParameter parameter, DateTime? start, DateTime? end, string orderno, string sku, string skucategoryid, string account,string itemid)
{
var _service = new Services.OrdersServices();
......@@ -1326,6 +1339,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="account"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【汇损费列表】->【查询】页面", 0)]
public string ExchangeLossFeeJson(BtTableParameter parameter, DateTime? start, DateTime? end, string selleraccount)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -1379,6 +1393,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="orderno"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【Ebay】->【内部商品编码利润】->【查询】页面", 0)]
public string ListEbayInnerCodeProfitJson(BtTableParameter parameter, DateTime start, DateTime end, string code, string orderno)
{
var companyid = HttpContextHelper.Current.User.GetCompanyId();
......@@ -1575,6 +1590,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【利润统计】->【平台利润统计】->【查询】页面", 0)]
public JsonResult PlatformProfitCountJson(string platform,string website, DateTime? start, DateTime? end, DateTime? shipstart, DateTime? shipend, string currency, string skucategoryids,string product_type,int? skusource,int? shippingstrategy,int? skunewcategory,int statistictype=0)
{
var _service = new Services.OrdersServices();
......@@ -2631,6 +2647,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="end"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【预收款明细】->【查询】页面", 0)]
public string DepositReceivedJson(BtTableParameter request, string platform, string website, string account, DateTime? start, DateTime? end)
{
var total = 0;
......@@ -2724,6 +2741,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
}
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【平台退款流水】->【查询】页面", 0)]
public string ListReturnJson(BtTableParameter parameter,DateTime? start,DateTime? end,DateTime? paystart,DateTime? payend,string platform,string website, string orderno,int? shipstatus)
{
var _service = new Services.OrdersServices();
......@@ -2822,6 +2840,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="account">帐号</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【亚马逊】->【亚马逊广告费】->【查询】页面", 0)]
public string AmazonADJson(BtTableParameter parameter, DateTime? start, DateTime? end,string account)
{
var _service = new Services.OrdersServices();
......@@ -3024,6 +3043,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="currency">币种</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【AliExpress】->【AliExpress广告费】->【查询】页面", 0)]
public string AlipressADJson(BtTableParameter parameter, DateTime? start, DateTime? end, string account, string currency="CNY")
{
var total = 0;
......@@ -3423,6 +3443,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="start"></param>
/// <param name="end"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【paypal流水】->【查询】页面", 0)]
public string ListPaypalJson(BtTableParameter parameter,DateTime? start,DateTime? end)
{
var total = 0;
......@@ -3537,6 +3558,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="skucategoryids"></param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【站点销售统计】->【查询】页面", 0)]
public string StatisticsByWebsiteJson(BtTableParameter request, string platform, string website, string selleraccount, DateTime start, DateTime end, string warehousetype, string warehousecode, string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -3658,6 +3680,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousecode">仓库编码</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【分平台利润统计】->【平台销售统计】->【查询】页面", 0)]
public string PlatformSaleStatisticsJson(BtTableParameter parameter, string platform,string selleraccount, string website, DateTime start, DateTime end, string warehousetype, string warehousecode, string skucategoryids)
{
var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
......@@ -3778,6 +3801,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousecode">仓库编码</param>
/// <param name="bailunsku">sku</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【数据分析】->【头程费配置】->【查询】页面", 0)]
public string ListCostFirstJson(BtTableParameter request, string warehousetype, string warehousecode, string bailunsku)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/PurchaseController.cs
......@@ -45,6 +45,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="no">采购单号</param>
/// <param name="status">采购单状态</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【订单】->【采购单】->【查询】页面", 0)]
public string ListPurchaseJson(BtTableParameter parameter, string warehouse, string sku, string no, int? status)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/SkuController.cs
......@@ -43,6 +43,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="sku"></param>
/// <param name="skuname"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【sku】->【查询】页面", 0)]
public string ListSkuJson(BtTableParameter parameter,string sku,string skuname)
{
var total = 0;
......@@ -98,6 +99,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="max">差异结束值</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【数据分析】->【Sku发货重量差异】->【查询】页面", 0)]
public string ListSkuDiffWeighJson(BtTableParameter parameter, string sku, string warehousetype,string warehousecode,DateTime? shipstart, DateTime? shipend, int? min, int? max)
{
var total = 0;
......@@ -173,6 +175,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="type">库龄，3：3个月以上，6：6个月以上，12：1年以上，24：2年以上，36：3年以上，4：3个月以上，6个月以下，7：6个月以上，12个月以下，13：12个月以上，24个月以下，25：24个月以上，36个月以下</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库龄列表】->【查询】页面", 0)]
public string ListInventoryAgingJson(BtTableParameter parameter, string sku, string warehouse,string warehousetype, int type,string buyername)
{
var total = 0;
......
Bailun.DC.Web/Areas/Reports/Controllers/WarehouseController.cs
......@@ -46,6 +46,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehouse">仓库编码</param>
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【逻辑仓库】->【查询】页面", 0)]
public string LogicWarehouseJson(BtTableParameter parameter,string warehousetype,string warehousecode)
{
var user = HttpContextHelper.Current?.User;
......@@ -253,6 +254,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousetype">仓库类型</param>
/// <param name="code">仓库编码</param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【库存】->【库存周转报表】->【查询】页面", 0)]
public string WarehouseRedundancyJson(BtTableParameter parameter, string warehousetype, string code,DateTime? day)
{
var total = 0;
......@@ -749,6 +751,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="t">1：按采购下单，2：按入库</param>
/// <returns></returns>
[HttpPost]
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【财务报表】->【每日销进差异汇总】->【查询】页面", 0)]
public JsonResult DailyPurchaseSalesCountJson(int dateWay, DateTime start, DateTime end, string warehousetype, string warehousecode, int t)
{
var list = new List<mDailyPurchaseSales>();
......@@ -1253,6 +1256,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousecode"></param>
/// <param name="skucategoryids"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【利润统计】->【仓库利润统计】->【查询】页面", 0)]
public string ListWarehouseProfitJson(BtTableParameter parameter,string warehousecode,string skucategoryids)
{
var total = 0;
......@@ -1346,6 +1350,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
/// <param name="warehousecode"></param>
/// <param name="skucategoryids"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【利润统计】->【sku利润统计】->【查询】页面", 0)]
public string ListSkuProfitJson(BtTableParameter parameter, string warehousecode, string skucategoryids)
{
var total = 0;
......
Bailun.DC.Web/Areas/Users/Controllers/HomeController.cs
......@@ -32,6 +32,7 @@ namespace Bailun.DC.Web.Areas.Users.Controllers
/// </summary>
/// <param name="parameter"></param>
/// <returns></returns>
[BrowseLog("Bailun_data", "访问【百伦数据中心】->【系统设置】->【角色设置】->【查询】页面", 0)]
public string ListUserRoles(BtTableParameter parameter,string name)
{
var total = 0;
......@@ -85,6 +86,7 @@ namespace Bailun.DC.Web.Areas.Users.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【系统设置】->【角色设置】->【保存用户角色信息】操作",1)]
public JsonResult SaveUserRole(int? id,string name,string note)
{
var user = HttpContextHelper.Current?.User;
......@@ -103,6 +105,7 @@ namespace Bailun.DC.Web.Areas.Users.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【系统设置】->【角色设置】->【删除用户角色信息】操作", 2)]
public JsonResult DelUserRole(int id)
{
var user = HttpContextHelper.Current?.User;
......@@ -301,6 +304,7 @@ namespace Bailun.DC.Web.Areas.Users.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【系统设置】->【权限设置】->【保存菜单权限】操作", 1)]
public JsonResult SaveRoleMenus(int roleid, string s,int? isall=0)
{
var user = HttpContextHelper.Current?.User;
......@@ -321,6 +325,7 @@ namespace Bailun.DC.Web.Areas.Users.Controllers
/// <returns></returns>
[BailunAuthentication(LoginMode.Enforce)]
[HttpPost]
[BrowseLog("Bailun_data", "触发【百伦数据中心】->【系统设置】->【权限设置】->【保存导出权限】操作", 1)]
public JsonResult SaveRoleExport(int roleid, string s)
{
var user = HttpContextHelper.Current?.User;
......
Bailun.DC.Web/BrowseLogAttribute.cs 0 → 100644
using System;
using Microsoft.AspNetCore.Mvc.Filters;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
using Newtonsoft.Json;
using Bailun.ServiceFabric.Extension;
using Bailun.ServiceFabric.Core.Extension.HttpContext;
using Bailun.ServiceFabric.Core.Extension;
namespace Bailun.DC.Web
{
public class BrowseLogAttribute : ActionFilterAttribute
{
/// <summary>
/// 项目id
/// </summary>
private readonly string _projectCode;
/// <summary>
/// 模块名称
/// </summary>
private readonly string _moduleName;
/// <summary>
/// 备注信息
/// </summary>
private readonly string _remark;
/// <summary>
/// 操作类型 (0查、1增、2删、3修改)
/// </summary>
private readonly int _operationType;
/// <summary>
/// 此特性负责写浏览日志
/// </summary>
/// <param name="projectId">项目id</param>
/// <param name="moduleName">模块名称</param>
/// <param name="operationType">操作类型 (0查、1增、2删、3修改)</param>
/// <param name="remark">备注信息</param>
public BrowseLogAttribute(string projectCode, string moduleName, int operationType, string remark = "")
{
_projectCode = projectCode;
_moduleName = moduleName;
_operationType = operationType;
_remark = remark;
}
public override void OnActionExecuted(ActionExecutedContext context)
{
try
{
string canLogValue = ConfigManagerConf.GetValue("BrowseLogSetting:CanLog");
if (canLogValue != "yes")
{
return;
}
var userId = HttpContextHelper.Current?.User?.GetUid();
var userName = HttpContextHelper.Current?.User?.GetUserName();
var companyId = HttpContextHelper.Current?.User?.GetCompanyId();
// 执行结果
var isSuccessed = true;
// 执行失败的信息
var execFaildMsg = "";
if (context.Exception != null && context.Result == null)
{
// 方法执行失败 有异常
isSuccessed = false;
execFaildMsg = context.Exception.Message;
}
// 组装写日志的入参
var input = new AddOperationLogInfoInput
{
UserId = (int)userId,
UserName = userName,
ProjectCode = _projectCode,
OperationType = _operationType,
OperationContent = _moduleName,
OperationTime = DateTime.Now,
IsSuccessed = isSuccessed,
FailInfo = execFaildMsg,
Remarks = _remark,
CompanyId = companyId
};
var url = ConfigManagerConf.GetValue("BrowseLogSetting:Url");
var logRes = PostAsync<AddOperationLogInfoInput, AddOperationLogInfoOutput>(url, input);
if (logRes.StatusCode != 200)
{
Console.WriteLine($"写浏览日志失败:{logRes.Message}");
}
}
catch (Exception e)
{
Console.WriteLine(e);
}
}
/// <summary>
/// HttpClient实现Post请求
/// </summary>
/// <typeparam name="T1">传入对象类型</typeparam>
/// <typeparam name="T2">返回对象类型</typeparam>
/// <param name="url"></param>
/// <param name="content"></param>
/// <returns></returns>
public static T2 PostAsync<T1, T2>(string url, T1 content) where T2 : new()
{
if (string.IsNullOrWhiteSpace(url) || content == null)
{
return new T2();
}
try
{
//设置内容压缩
var handler = new HttpClientHandler() { AutomaticDecompression = DecompressionMethods.GZip };
using (var client = new HttpClient(handler))
{
client.DefaultRequestHeaders.Accept.Clear();
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
var postDataJson = JsonConvert.SerializeObject(content, new JsonSerializerSettings()
{
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore
});
var response = client.PostAsync(url, new StringContent(postDataJson, Encoding.UTF8, "application/json")).Result;
//var response = client.PostAsJsonAsync<T1>(url, content).Result;
if (response.IsSuccessStatusCode)
{
var reponseResult = response.Content.ReadAsStringAsync().Result;
var result = JsonConvert.DeserializeObject<T2>(reponseResult, new JsonSerializerSettings()
{
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore
});
return result;
}
return JsonConvert.DeserializeObject<T2>(null, new JsonSerializerSettings()
{
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
NullValueHandling = NullValueHandling.Ignore
});
//return new T2() { Message = "HTTP响应失败", };
}
}
catch (Exception ex)
{
throw ex;
}
}
public class AddOperationLogInfoOutput
{
/// <summary>
/// 信息
/// </summary>
[JsonProperty("message")]
public string Message { get; set; }
/// <summary>
/// 结果
/// </summary>
[JsonProperty("result")]
public object Result { get; set; }
/// <summary>
/// 状态码
/// </summary>
[JsonProperty("statusCode")]
public int StatusCode { get; set; }
}
public class AddOperationLogInfoInput
{
/// <summary>
///
/// </summary>
public int UserId { get; set; }
/// <summary>
/// 系统id
/// </summary>
public int ProjectId { get; set; }
/// <summary>
/// 系统代码
/// </summary>
public string ProjectCode { get; set; }
/// <summary>
///
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 公司id
/// </summary>
public string CompanyId { get; set; }
/// <summary>
/// 操作类型（0查、1增、2删、3修改）
/// </summary>
public int OperationType { get; set; }
/// <summary>
/// 操作内容
/// </summary>
public string OperationContent { get; set; }
/// <summary>
/// 操作时间
/// </summary>
public DateTime OperationTime { get; set; } = DateTime.Now;
/// <summary>
/// 是否操作成功
/// </summary>
public bool IsSuccessed { get; set; }
/// <summary>
/// 失败原因
/// </summary>
public string FailInfo { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
}
}
}
\ No newline at end of file
Bailun.DC.Web/appsettings.Development.json
......@@ -5,5 +5,9 @@
"System": "Information",
"Microsoft": "Information"
}
},
"BrowseLogSetting": {
"Url": "http://saas.admin.bailuntec.com/Api/Ssoadmin/operationloginfo/addoperationloginfo",
"CanLog": "yes"
}
}
Bailun.DC.Web/appsettings.json
......@@ -15,5 +15,9 @@
"AppSetting": {
"SsoUrl": "http://sso.bailuntec.com", //֤url
"AuthType": "" //Ƿdebugģʽ
},
"BrowseLogSetting": {
"Url": "http://saas.admin.bailuntec.com/Api/Ssoadmin/operationloginfo/addoperationloginfo",
"CanLog": "yes"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment