Commit 18824b02 by 泽锋 李

商品销售情况统计 新增文件上传

parent 0374a869
...@@ -10,6 +10,7 @@ using System.Data; ...@@ -10,6 +10,7 @@ using System.Data;
using AutoTurnOver.Models.ApiDto; using AutoTurnOver.Models.ApiDto;
using System.Dynamic; using System.Dynamic;
using System.IO; using System.IO;
using System.Threading.Tasks;
namespace AutoTurnOver.Services namespace AutoTurnOver.Services
{ {
...@@ -583,6 +584,7 @@ namespace AutoTurnOver.Services ...@@ -583,6 +584,7 @@ namespace AutoTurnOver.Services
try try
{ {
var qiniuname = $"{user.UserAccount}商品汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}.csv";
var fileName = AppContext.BaseDirectory + $@"Result\RealtimeStock\{user.UserAccount}商品汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}.csv"; var fileName = AppContext.BaseDirectory + $@"Result\RealtimeStock\{user.UserAccount}商品汇总-{DateTime.Now.ToString("yyyyMMddHHmmss")}.csv";
var total = 0; var total = 0;
...@@ -635,9 +637,10 @@ namespace AutoTurnOver.Services ...@@ -635,9 +637,10 @@ namespace AutoTurnOver.Services
stream.CopyTo(memory); stream.CopyTo(memory);
} }
memory.Position = 0; memory.Position = 0;
return memory; return memory;
} }
catch (Exception) catch (Exception ex)
{ {
throw; throw;
} }
......
...@@ -719,7 +719,7 @@ namespace AutoTurnOver.Controllers ...@@ -719,7 +719,7 @@ namespace AutoTurnOver.Controllers
}); });
} }
public FileResult GetGoodsExport(string product_inner_code, string platform_type) public async Task<FileResult> GetGoodsExport(string product_inner_code, string platform_type)
{ {
var user = AutoUtility.GetUser(); var user = AutoUtility.GetUser();
var m = new bailun_sku_goods_search_dto var m = new bailun_sku_goods_search_dto
...@@ -728,6 +728,7 @@ namespace AutoTurnOver.Controllers ...@@ -728,6 +728,7 @@ namespace AutoTurnOver.Controllers
platform_type = platform_type platform_type = platform_type
}; };
var memory = new ReportServices().GetGoodsExport(m, user); var memory = new ReportServices().GetGoodsExport(m, user);
var fileData = await QiNiuCloudHelper.UploadAsync(memory, $"商品销售情况统计{user.UserName}-{DateTime.Now.ToString("yyyyMMddHHmmss")}导入结果.csv");
return File(memory, "text/csv", $"{user.UserAccount}商品汇总数据信息.csv"); return File(memory, "text/csv", $"{user.UserAccount}商品汇总数据信息.csv");
} }
......
...@@ -62,7 +62,11 @@ namespace AutoTurnOver ...@@ -62,7 +62,11 @@ namespace AutoTurnOver
} }
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
//app.UseHttpsRedirection(); //app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseFileServer(new FileServerOptions()//直接开启文件目录访问和文件访问
{
EnableDirectoryBrowsing = true//开启目录访
});
// 跨域配置 // 跨域配置
//app.UseCors(builder => //app.UseCors(builder =>
//builder.WithOrigins("http://aims.bailuntec.com") //builder.WithOrigins("http://aims.bailuntec.com")
......
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