Skip to content

D
data-center-auto
Commit 0c626365 by 泽锋 李
Options

fix

parent cce38443
Showing with 129 additions and 6 deletions
AutoTurnOver.DB/report_cash_flow_dao.cs
......@@ -29,12 +29,12 @@ namespace AutoTurnOver.DB
while (true)
{
var now = DateTime.Now;
var sql = " select * from dc_base_oms_sku where gmt_modified>=@btime ";
var sql = " select * from dc_base_oms_sku where gmt_create>=@btime ";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
if (etime != null)
{
sql += " and gmt_modified<=@etime ";
sql += " and gmt_create<=@etime ";
parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59"));
}
sql += $" order by id desc limit {(page - 1) * rows},{rows} ";
......@@ -303,12 +303,12 @@ namespace AutoTurnOver.DB
while (true)
{
var now = DateTime.Now;
var sql = " select * from dc_base_oms_sku where gmt_modified>=@btime ";
var sql = " select * from dc_base_oms_sku where gmt_create>=@btime ";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
if (etime != null)
{
sql += " and gmt_modified<=@etime ";
sql += " and gmt_create<=@etime ";
parameters.Add("etime", etime.Value.ToString("yyyy-MM-dd 23:59:59"));
}
sql += $" order by id desc limit {(page - 1) * rows},{rows} ";
......@@ -814,5 +814,41 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
}
return datas;
}
/// <summary>
/// 导出
/// </summary>
/// <returns></returns>
public static List<dc_report_cash_flow_log_dto> Export(dc_report_cash_flow_log_export_search_dto search)
{
if(search.btime==null || search.etime == null)
{
throw new Exception("时间范围必选");
} if(search.type==null)
{
throw new Exception("时间类型必选");
}
var sql = " select t1.*,t2.warehouse_name from dc_report_cash_flow_log as t1 left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where t1.is_delete=0 ";
DynamicParameters parameters = new DynamicParameters();
if (search.type == 1)
{
sql += " and t1.occur_time>=@btime ";
sql += " and t1.occur_time<=@etime ";
}
else
{
sql += " and t1.pay_time>=@btime ";
sql += " and t1.pay_time<=@etime ";
}
parameters.Add("btime",search.btime.Value.ToDayHome());
parameters.Add("etime",search.etime.Value.ToDayEnd());
if (search.data_type > 0)
{
sql += " and t1.data_type=@data_type ";
parameters.Add("data_type", search.data_type);
}
return _connection.Query<dc_report_cash_flow_log_dto>(sql, parameters).AsList();
}
}
}
AutoTurnOver.Models/dc_report_cash_flow_log.cs
......@@ -59,6 +59,19 @@ namespace AutoTurnOver.Models
public DateTime? update_time { get; set; }
}
public class dc_report_cash_flow_log_dto: dc_report_cash_flow_log
{
public string data_type_str
{
get
{
return ((dc_report_cash_flow_log_data_type_enum)data_type).ToString();
}
}
public string warehouse_name { get; set; }
}
/// <summary>
/// 1 = 销售数量 2 = 销售金额 3 = 退款 4 = 利润 5 =平台费用 6=释放销售成本 7 = 释放头程费用 8 = 尾程费用 9 = 新增采购费用 10 = 新增头程费用
/// </summary>
......@@ -153,4 +166,16 @@ namespace AutoTurnOver.Models
public DateTime? btime { get; set; }
public DateTime? etime { get; set; }
}
public class dc_report_cash_flow_log_export_search_dto
{
public DateTime? btime { get; set; }
public DateTime? etime { get; set; }
public int? data_type { get; set; }
/// <summary>
/// 1 = 根据发生时间查询
/// 2 = 根据支付时间查询
/// </summary>
public int? type { get; set; }
}
}
AutoTurnOver.Services/CashFlowServices.cs
......@@ -32,5 +32,10 @@ namespace AutoTurnOver.Services
return datas;
}
public List<dc_report_cash_flow_log_dto> Export(dc_report_cash_flow_log_export_search_dto search)
{
return report_cash_flow_dao.Export(search);
}
}
}
AutoTurnOver/Controllers/CashFlowController.cs
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using AutoTurnOver.Common;
using AutoTurnOver.Models;
using AutoTurnOver.Services;
using Microsoft.AspNetCore.Http;
......@@ -28,5 +31,58 @@ namespace AutoTurnOver.Controllers
total = 0,
});
}
public FileResult Export(DateTime? btime, DateTime? etime, int? data_type = null,int? type = null)
{
var m = new dc_report_cash_flow_log_export_search_dto
{
data_type = data_type,
btime = btime,
etime = etime,
type = type,
};
var service = new Services.CashFlowServices();
var list = service.Export(m);
DataTable table = new DataTable();
string[] cols = new string[] { "Sku","仓库编码","仓库名称","平台","数据类型","金额","发生时间","支付时间","相关单号","备注"
};
foreach (var item in cols)
{
table.Columns.Add(item);
}
foreach (var itemData in list)
{
DataRow row = table.NewRow();
row["Sku"] = itemData.bailun_sku;
row["仓库编码"] = itemData.warehouse_code;
row["仓库编码"] = itemData.warehouse_code;
row["仓库名称"] = itemData.warehouse_name;
row["平台"] = itemData.platform_type;
row["数据类型"] = itemData.data_type_str;
row["发生时间"] = itemData.occur_time;
row["支付时间"] = itemData.pay_time;
row["相关单号"] = itemData.no;
row["备注"] = itemData.remarks;
row["金额"] = itemData.val;
table.Rows.Add(row);
}
var fileName = AppContext.BaseDirectory + @"Result\RealtimeStock\现金流明细.csv";
DataTableHelper.SaveCSV(table, fileName);
var memory = new MemoryStream();
using (var stream = new FileStream(fileName, FileMode.Open))
{
stream.CopyTo(memory);
}
memory.Position = 0;
return File(memory, "text/csv", "现金流明细.csv");
}
}
}
\ No newline at end of file
ResetOutofstock/CaseFlowBackgrounService.cs
......@@ -24,7 +24,7 @@ namespace ResetOutofstock
if (now.Hour == 01 && now.Minute == 01)
{
Console.WriteLine($"开始 刷新现金流 订单数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report_cash_flow_dao.CalculationOrder(now.AddDays(-7),DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
report_cash_flow_dao.CalculationOrder(now.AddMonths(-3),DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
Console.WriteLine($"结束刷新现金流 订单数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
if (now.Hour == 01 && now.Minute == 02)
......@@ -48,7 +48,7 @@ namespace ResetOutofstock
if (now.Hour == 01 && now.Minute == 05)
{
Console.WriteLine($"开始 刷新订单尾程费 退款数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
report_cash_flow_dao.CalculationOrderCostLogistics(now.AddDays(-7), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
report_cash_flow_dao.CalculationOrderCostLogistics(now.AddMonths(-3), DateTime.Parse(now.AddDays(-1).ToString("yyyy-MM-dd 23:59:59")));
Console.WriteLine($"结束 刷新订单尾程费 退款数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
}
}
......
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