刷新订单数据

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -51,12 +51,28 @@ namespace AutoTurnOver.DB
 
                     var addList = new List<dc_report_cash_flow_log>();
                     var updateList = new List<dc_report_cash_flow_log>();
-
+                    // 未拦截订单
+                    var bailun_interception_status = new List<string>() { "None", "Failed" };
                     foreach (var order_item in order_list)
                     {
                         try
                         {
                             var item_no = order_item.bailun_order_id;
+                            var is_delete = (
+                                (!bailun_interception_status.Any(v => v.Equals(order_item.bailun_interception_status, StringComparison.OrdinalIgnoreCase))) // 拦截单
+                                ||
+                                order_item.has_innersale==1 // 内购单
+                                ||
+                                "Canceled".Equals(order_item.bailun_order_status, StringComparison.OrdinalIgnoreCase) // 取消单
+                                ||
+                                ((!"FBA".Equals(order_item.platform_type, StringComparison.OrdinalIgnoreCase)) && "CantHandle".Equals(order_item.bailun_order_status, StringComparison.OrdinalIgnoreCase)) // 非fba 的订单状态为取消
+                                ||
+                                order_item.has_scalp ==1 // 刷单
+                                ||
+                                order_item.has_delete==1
+                                ||
+                                order_item.company_id!=1
+                                ) ?1:0;
 
                             #region 销售释放成本
 
@@ -64,7 +80,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.释放销售成本,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -105,7 +121,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.PayPal费,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -146,7 +162,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.FBA费,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -187,7 +203,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.释放头程费用,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -228,7 +244,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.平台费用,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -269,7 +285,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.利润,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -310,7 +326,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.销售数量,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,
@@ -351,7 +367,7 @@ namespace AutoTurnOver.DB
                             {
                                 bailun_sku = order_item.bailun_sku,
                                 data_type = (int)dc_report_cash_flow_log_data_type_enum.销售金额,
-                                is_delete = (order_item.has_delete == 1 || order_item.has_scalp == 1) ? 1 : 0,
+                                is_delete = is_delete,
                                 item = order_item.bailun_order_id,
                                 update_time = now,
                                 no = order_item.bailun_order_id,

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -16,11 +16,11 @@ namespace ResetOutofstock
         {
             Task.Factory.StartNew(() =>
             {
-                Console.WriteLine("开始刷新广告费数据");
+                Console.WriteLine("开始刷新oms订单数据");
                 var now = DateTime.Now;
-                //report_cash_flow_dao.CalculationTransferOrder(now.AddMonths(-3), 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")));
                 report.ResetCashFlowData();
-                Console.WriteLine("结束刷新广告费数据");
+                Console.WriteLine("结束oms订单数据");
             });