新增pay费，跟fba费的抓取

AutoTurnOver.DB/report.cs

@@ -1791,7 +1791,7 @@ sum(case when occur_time>=@btime and data_type not in (2) then val else 0 end )
 sum(case when occur_time<@btime and data_type in (2) then val else 0 end ) as 'last_income', 
 sum(case when occur_time<@btime and data_type not in (2) then  val else 0 end ) as 'last_expend',
 1 as 'type'
-from dc_report_cash_flow_log where occur_time>=@lastBtime and data_type in (2,3,5,8,9,10) 
+from dc_report_cash_flow_log where occur_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12) 
 GROUP BY bailun_sku;
 
 insert dc_report_cash_flow_sku_group_temp(`bailun_sku`,`balance`,`current_date_begin`,`current_date_end`,`last_date_begin`,`last_date_end`,`current_income`,`current_expend`,`last_income`,`last_expend`,`type`)
@@ -1807,7 +1807,7 @@ sum(case when pay_time>=@btime and data_type not in (2) then val else 0 end ) as
 sum(case when pay_time<@btime and data_type in (2) then val else 0 end ) as 'last_income', 
 sum(case when pay_time<@btime and data_type not in (2) then  val else 0 end ) as 'last_expend',
 2 as 'type'
-from dc_report_cash_flow_log where pay_time>=@lastBtime and data_type in (2,3,5,8,9,10) 
+from dc_report_cash_flow_log where pay_time>=@lastBtime and data_type in (2,3,5,8,9,10,11,12) 
 GROUP BY bailun_sku;
 
 

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -50,6 +50,82 @@ namespace AutoTurnOver.DB
                     {
                         try
                         {
+                            #region PayPal费
+
+                            dc_report_cash_flow_log item8 = new dc_report_cash_flow_log()
+                            {
+                                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,
+                                item = order_item.bailun_order_id,
+                                update_time = now,
+                                no = order_item.bailun_order_id,
+                                platform_type = order_item.platform_type,
+                                remarks = "",
+                                val = 0 - Math.Abs(order_item.cost_paypal_fee * order_item.seller_order_exchange_rate * order_item.bailun_sku_quantity_ordered),
+                                occur_time = order_item.paid_time ?? new DateTime(1991, 1, 1),
+                                warehouse_code = order_item.warehouse_code,
+                                pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
+                                item_no = order_item.bailun_order_id
+                            };
+                            item8.occur_time_year_month_no = $"{item8.occur_time.Year}-{item8.occur_time.Month}-{item8.bailun_sku}";
+                            item8.pay_time_year_month_no = $"{item8.pay_time.Year}-{item8.pay_time.Month}-{item8.bailun_sku}";
+                            item8.pay_time = CalculationPayTime(configs, item8.occur_time, item8.data_type, item8.platform_type);
+                            item8.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
+                            {
+                                data_type = item8.data_type,
+                                bailun_sku = item8.bailun_sku,
+                                item_no = item8.item_no
+                            }) ?? 0;
+                            if (item8.id > 0)
+                            {
+                                conn.Update(item8);
+                            }
+                            else
+                            {
+                                conn.Insert(item8);
+                            }
+
+                            #endregion
+
+                            #region fba 费
+
+                            dc_report_cash_flow_log item7 = new dc_report_cash_flow_log()
+                            {
+                                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,
+                                item = order_item.bailun_order_id,
+                                update_time = now,
+                                no = order_item.bailun_order_id,
+                                platform_type = order_item.platform_type,
+                                remarks = "",
+                                val = 0 - Math.Abs(order_item.cost_fba_fee * order_item.seller_order_exchange_rate * order_item.bailun_sku_quantity_ordered),
+                                occur_time = order_item.paid_time ?? new DateTime(1991, 1, 1),
+                                warehouse_code = order_item.warehouse_code,
+                                pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
+                                item_no = order_item.bailun_order_id
+                            };
+                            item7.occur_time_year_month_no = $"{item7.occur_time.Year}-{item7.occur_time.Month}-{item7.bailun_sku}";
+                            item7.pay_time_year_month_no = $"{item7.pay_time.Year}-{item7.pay_time.Month}-{item7.bailun_sku}";
+                            item7.pay_time = CalculationPayTime(configs, item7.occur_time, item7.data_type, item7.platform_type);
+                            item7.id = conn.QuerySingleOrDefault<int?>(" select * from dc_report_cash_flow_log where data_type=@data_type and  bailun_sku=@bailun_sku and item_no=@item_no ", new
+                            {
+                                data_type = item7.data_type,
+                                bailun_sku = item7.bailun_sku,
+                                item_no = item7.item_no
+                            }) ?? 0;
+                            if (item7.id > 0)
+                            {
+                                conn.Update(item7);
+                            }
+                            else
+                            {
+                                conn.Insert(item7);
+                            }
+
+                            #endregion
+
                             #region 释放头程费用
 
                             dc_report_cash_flow_log item6 = new dc_report_cash_flow_log()
@@ -792,8 +868,10 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
             datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 8 }, date_type_str = "尾程费用", remarks = "oms 订单中海外仓发货的，支付时间 已 读取对应物流商的账期", dates = new List<report_cash_flow_view_dto.date_dto>() });
             datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 9 }, date_type_str = "新增采购费用", remarks = " 1、采购系统的数据，外采订单直接读取订单支付时间。2、向自己工厂采购的（无需付款）的单，支付时间=下单时间 ", dates = new List<report_cash_flow_view_dto.date_dto>() });
             datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 10 }, date_type_str = "新增头程费用", remarks = " 调拨单的数据，支付时间 已 读取对应物流商的账期，注：调拨单需要付款之后才能获取到金额 ", dates = new List<report_cash_flow_view_dto.date_dto>() });
+            datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 11 }, date_type_str = "fba费", remarks = "  ", dates = new List<report_cash_flow_view_dto.date_dto>() });
+            datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 12 }, date_type_str = "paypal费", remarks = "  ", dates = new List<report_cash_flow_view_dto.date_dto>() });
             datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 4 }, date_type_str = "汇总利润", remarks = " oms 中的订单，分摊到sku的利润，不包含广告费，上架费，退款 ", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = new List<int> {2,9,10,5,8 }, date_type_str = "现金流结余", remarks = " 销售金额 - 新增采购费用 - 新增头程费用 - 平台费用 - 尾程费用  ", dates = new List<report_cash_flow_view_dto.date_dto>() });
+            datas.Add(new report_cash_flow_view_dto { date_type = new List<int> {2,9,10,5,8,11,12 }, date_type_str = "现金流结余", remarks = " 销售金额 - 新增采购费用 - 新增头程费用 - 平台费用 - 尾程费用  ", dates = new List<report_cash_flow_view_dto.date_dto>() });
             var btime = DateTime.Now.AddDays(-8).ToDayHome();
             var etime = DateTime.Now.AddDays(-1).ToDayEnd();
             if (search.btime != null)

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -89,7 +89,9 @@ namespace AutoTurnOver.Models
         释放头程费用 = 7,
         尾程费用 =8,
         新增采购费用 = 9,
-        新增头程费用 = 10
+        新增头程费用 = 10,
+        FBA费 = 11,
+        PayPal费  =12
     }
 
     public enum dc_report_cash_flow_log_pay_type_enum

ResetOutofstock/ResetOutofstockBackgrounService.cs

@@ -14,8 +14,27 @@ namespace ResetOutofstock
 
         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);
+                    }
+
+
+                    Thread.Sleep(240 * 60 * 60 * 1000);
+                }
+            });
+
 
             Task.Factory.StartNew(() => {
                 while (true)