Skip to content

D
data-center-auto
Commit 6c16e1f2 by 泽锋 李
Options

重新刷新退款数据

parent 69b2df6a
Showing with 64 additions and 70 deletions
AutoTurnOver.DB/report_cash_flow_dao.cs
......@@ -665,12 +665,15 @@ namespace AutoTurnOver.DB
while (true)
{
var now = DateTime.Now;
var sql = " select t1.* from dc_base_crm_refund as t1 where gmt_create>=@btime and gmt_create<=@etime ";
var sql = @" select t1.*,(case when t1.platform_type='ebay' then t3.warehouse_code else t2.warehouse_code end) as 'warehouse_code' from dc_base_crm_refund as t1
left join dc_base_oms_sku as t2 on t1.origin_order_id = t2.origin_order_id and t1.bailun_sku = t2.bailun_sku
left join dc_base_oms_sku as t3 on t1.origin_order_id = t3.transaction_id and t1.bailun_sku = t3.bailun_sku
where t1.gmt_create>=@btime and t1.gmt_create<=@etime ";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("btime", btime.ToString("yyyy-MM-dd 00:00:00"));
parameters.Add("etime", etime.ToString("yyyy-MM-dd 23:59:59"));
sql += $" limit {(page - 1) * rows},{rows} ";
var order_list = conn.Query<dc_base_crm_refund>(sql, parameters).AsList();
var order_list = conn.Query<dc_base_crm_refund_dto>(sql, parameters).AsList();
if (order_list == null || order_list.Count <= 0)
{
break;
......@@ -694,7 +697,7 @@ namespace AutoTurnOver.DB
remarks = "",
val = 0 - Math.Abs(order_item.amount_refund_rmb),
occur_time = order_item.refund_time ?? new DateTime(1991, 1, 1),
warehouse_code = "",
warehouse_code = order_item.warehouse_code,
pay_type = (int)dc_report_cash_flow_log_pay_type_enum.实时,
item_no = order_item.crm_id.ToString()
};
......@@ -1057,20 +1060,27 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
{
search.data_type = 1;
}
var sql = @" select t1.*,t2.sku_title_cn as 'sku_name',t2.`status` as 'sku_status',t2.buyer_name,t3.warehouse_extend_name as 'warehouse_name',ifnull(t4.usable_stock,0) as 'usable_stock',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way',
(ifnull(t4.usable_stock,0) * t2.unit_price) as 'stock_amount',(ifnull(t5.quantity_transfer,0)+ifnull(t5.quantity_purchase,0)) as 'on_the_way_amount',ifnull(t8.history_sevenday_sales,0) as 'history_sevenday_sales',ifnull(t8.history_fourteenday_sales,0) as 'history_fourteenday_sales',ifnull(t8.history_thirtyday_sales,0) as 'history_thirtyday_sales'
var sql = @" select t1.*,t2.sku_title_cn as 'sku_name',t2.`status` as 'sku_status',t2.buyer_name,
ifnull(t4.usable_stock,0) as 'usable_stock',
(ifnull(t4.on_the_way,0)) as 'on_the_way',
(ifnull(t4.stock_amount,0)) as 'stock_amount',
(ifnull(t4.on_the_way_amount,0)) as 'on_the_way_amount',
ifnull(t4.history_sevenday_sales,0) as 'history_sevenday_sales',
ifnull(t4.history_fourteenday_sales,0) as 'history_fourteenday_sales',
ifnull(t4.history_thirtyday_sales,0) as 'history_thirtyday_sales'
from dc_report_cash_flow_sku_group as t1
left join dc_base_sku as t2 on t1.bailun_sku=t2.bailun_sku
left join dc_base_warehouse as t3 on t1.warehouse_code = t3.warehouse_code
left join dc_base_stock as t4 on t1.bailun_sku = t4.bailun_sku and t1.warehouse_code = t4.warehouse_code
left join dc_mid_transit as t5 on t1.bailun_sku = t5.bailun_sku and t1.warehouse_code = t5.warehouse_code
left join dc_base_sku_sum as t4 on t1.bailun_sku = t4.bailun_sku
left join dc_auto_config_sku_label as t6 on t1.bailun_sku = t6.bailun_sku
left join dc_auto_config_sku_warehouse as t7 on t1.bailun_sku = t7.bailun_sku and t1.warehouse_code = t7.warehouse_code
left join dc_auto_turnover as t8 on t1.bailun_sku = t8.bailun_sku and t1.warehouse_code = t8.warehouse_code
where t1.type=@type ";
DynamicParameters parameters = new DynamicParameters();
parameters.Add("type", search.data_type);
if (!string.IsNullOrWhiteSpace(search.product_type))
{
sql += " and t2.product_type=@product_type ";
parameters.Add("product_type", search.product_type);
}
if (!string.IsNullOrWhiteSpace(search.bailun_sku))
{
sql += " and t1.bailun_sku=@bailun_sku ";
......@@ -1086,37 +1096,11 @@ where t1.type=@type ";
sql += " and t2.buyer_name = @buyer_name";
parameters.Add("buyer_name", search.buyer_name);
}
if (search.monitor_status == 1)
{
sql += " and t7.`status`=1 ";
}
if (search.monitor_status == 0)
{
sql += " and ( t7.`status`=0 or t7.`status` is null ) ";
}
if (!string.IsNullOrWhiteSpace(search.supplier_name))
{
sql += " and t2.suppliers_name =@suppliers_name ";
parameters.Add("suppliers_name", search.supplier_name);
}
if (search.warehouse_code != null)
{
sql += $" and t1.warehouse_code=@warehouse_code ";
parameters.Add("warehouse_code", search.warehouse_code);
}
else
{
if (!string.IsNullOrWhiteSpace(search.warehousetype))
{
sql += " and t3.hq_type=" + $"'{search.warehousetype}'";
}
if (search.warehousearea > 0)
{
sql += " and t3.area_id=" + search.warehousearea;
}
}
return _connection.Page<dc_report_cash_flow_sku_group_dto>(sql, search, parameters);
}
......
AutoTurnOver.Models/Report/dc_base_crm_refund.cs
......@@ -146,4 +146,9 @@ namespace AutoTurnOver.Models.Report
/// </summary>
public string refund_type { get; set; }
}
public class dc_base_crm_refund_dto: dc_base_crm_refund
{
public string warehouse_code { get; set; }
}
}
AutoTurnOver.Models/dc_report_cash_flow_log.cs
......@@ -276,5 +276,6 @@ namespace AutoTurnOver.Models
public string buyer_name { get; set; }
public string supplier_name { get; set; }
public string product_type { get; set; }
}
}
AutoTurnOver/Controllers/CashFlowController.cs
......@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using AutoTurnOver.Common;
using AutoTurnOver.Models;
......@@ -87,7 +88,7 @@ namespace AutoTurnOver.Controllers
return File(memory, "text/csv", "现金流明细.csv");
}
public JsonResult GetSkuView(int? data_type , string sku_label, string bailun_sku, int offset, int limit, string order, string sort, string buyer_name, string warehousecode, string supplier_name, string warehousetype, int? warehousearea, int? monitor_status = null)
public JsonResult GetSkuView(int? data_type , string sku_label, string bailun_sku, int offset, int limit, string order, string sort, string buyer_name, string supplier_name,string product_type)
{
try
{
......@@ -99,13 +100,10 @@ namespace AutoTurnOver.Controllers
sidx = sort,
sord = order,
buyer_name = buyer_name,
sku_label = sku_label,
sku_label = string.IsNullOrWhiteSpace( sku_label)?null : WebUtility.UrlDecode(sku_label),
data_type = data_type,
monitor_status = monitor_status,
supplier_name = supplier_name,
warehousearea = warehousearea,
warehousetype = warehousetype,
warehouse_code = warehousecode
product_type = product_type
};
var services = new CashFlowServices();
var page_data = services.SkuView(m);
......
ResetOutofstock/ResetOutofstockBackgrounService.cs
......@@ -8,34 +8,35 @@ using System.Threading.Tasks;
namespace ResetOutofstock
{
public class ResetOutofstockBackgrounService : BackgroundService
public class ResetOutofstockBackgrounService : BackgroundService
{
private Timer _timer;
protected override Task ExecuteAsync(CancellationToken stoppingToken)
{
//Task.Factory.StartNew(() => {
// while (true)
// {
// try
// {
// Console.WriteLine($"开始 刷新现金流 订单数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
// var now = DateTime.Now;
// 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")}");
// }
// catch (Exception ex)
// {
// Console.WriteLine(ex.Message);
// }
Task.Factory.StartNew(() =>
{
while (true)
{
try
{
Console.WriteLine($"开始 刷新现金流 退款数据，线程Id：{Thread.CurrentThread.ManagedThreadId}，{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}");
var now = DateTime.Now;
report_cash_flow_dao.CalculationRefundOrder(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")}");
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
// Thread.Sleep(240 * 60 * 60 * 1000);
// }
//});
Thread.Sleep(240 * 60 * 60 * 1000);
}
});
//Task.Factory.StartNew(() => {
// while (true)
......@@ -58,7 +59,8 @@ namespace ResetOutofstock
//});
Task.Factory.StartNew(() => {
Task.Factory.StartNew(() =>
{
while (true)
{
try
......@@ -77,7 +79,8 @@ namespace ResetOutofstock
}
});
Task.Factory.StartNew(() => {
Task.Factory.StartNew(() =>
{
while (true)
{
try
......@@ -96,7 +99,8 @@ namespace ResetOutofstock
}
});
Task.Factory.StartNew(() => {
Task.Factory.StartNew(() =>
{
while (true)
{
try
......@@ -116,8 +120,9 @@ namespace ResetOutofstock
Thread.Sleep(5 * 60 * 1000);
}
});
Task.Factory.StartNew(() => {
Task.Factory.StartNew(() =>
{
while (true)
{
try
......@@ -134,8 +139,9 @@ namespace ResetOutofstock
Thread.Sleep(30 * 60 * 1000);
}
});
Task.Factory.StartNew(() => {
Task.Factory.StartNew(() =>
{
while (true)
{
try
......@@ -153,11 +159,11 @@ namespace ResetOutofstock
}
});
return Task.CompletedTask;
}
public override void Dispose()
{
base.Dispose();
......
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