平台费存负值

AutoTurnOver.DB/report.cs

@@ -1717,6 +1717,38 @@ truncate table dc_base_stock_record_temp;
 
 
 ", commandTimeout: 0);
+
+                //现金流汇总报表，9点之前还在跑数据，不用刷新
+                if (DateTime.Now.Hour > 9)
+                {
+                    _connection.Execute(@" -- 刷新 现金流汇总表
+set session transaction isolation level read uncommitted;
+start transaction;
+
+-- 清空视图表的数据
+Truncate table dc_report_cash_flow_group_day_temp;
+
+insert dc_report_cash_flow_group_day_temp (`year`,`month`,`day`,`val`,`data_type`,`type`,`date`)
+(
+select year(occur_time) as 'year',month(occur_time) as 'month',day(occur_time) as 'day',sum(val) as 'val',data_type,1,min(occur_time) as 'date' from dc_report_cash_flow_log where  is_delete=0  GROUP BY data_type,year(occur_time),month(occur_time),day(occur_time)
+)
+;
+
+insert dc_report_cash_flow_group_day_temp (`year`,`month`,`day`,`val`,`data_type`,`type`,`date`)
+(
+select year(pay_time) as 'year',month(pay_time) as 'month',day(pay_time) as 'day',sum(val) as 'val',data_type,2,min(pay_time) as 'date' from dc_report_cash_flow_log where  is_delete=0  GROUP BY data_type,year(pay_time),month(pay_time),day(pay_time)
+);
+
+alter table dc_report_cash_flow_group_day rename dc_report_cash_flow_group_dayTemp; 
+alter table dc_report_cash_flow_group_day_temp rename dc_report_cash_flow_group_day; 
+alter table dc_report_cash_flow_group_dayTemp rename dc_report_cash_flow_group_day_temp; 
+truncate table dc_report_cash_flow_group_day_temp; 
+
+
+
+", commandTimeout: 0);
+                }
+                
             }
             catch (Exception ex)
             {

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -132,7 +132,7 @@ namespace AutoTurnOver.DB
                                 no = order_item.bailun_order_id,
                                 platform_type = order_item.platform_type,
                                 remarks = "",
-                                val = order_item.cost_platform_fee * order_item.seller_order_exchange_rate * order_item.bailun_sku_quantity_ordered,
+                                val =  0 - Math.Abs( order_item.cost_platform_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.后付,
@@ -770,7 +770,7 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
             datas.Add(new report_cash_flow_view_dto { date_type = 7, date_type_str = "释放头程费用", remarks = "", dates = new List<report_cash_flow_view_dto.date_dto>() });
             datas.Add(new report_cash_flow_view_dto { date_type = 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 = 9, date_type_str = "新增采购费用", remarks = " 采购系统的数据，外采订单直接读取订单支付时间，向自己工厂采购的（无需付款）的单，支付时间=下单时间 ", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = 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 = 10, 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();
@@ -780,18 +780,18 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
             }
             if (search.etime != null)
             {
-                btime = search.etime.Value.ToDayEnd();
+                etime = search.etime.Value.ToDayEnd();
             }
 
             var conn = _connection;
-            var occur_sql = " select * from dc_report_cash_flow_log where is_delete=0 and occur_time>=@btime and occur_time<=@etime ";
-            var pay_sql = " select * from dc_report_cash_flow_log where is_delete=0 and pay_time>=@btime and pay_time<=@etime ";
+            var occur_sql = " select * from dc_report_cash_flow_group_day where `type`=1 and  `date`>=@btime and `date`<=@etime ";
+            var pay_sql = " select * from dc_report_cash_flow_group_day where `type`=2  and `date`>=@btime and `date`<=@etime ";
             DynamicParameters parameters = new DynamicParameters();
             parameters.Add("btime", btime);
             parameters.Add("etime", etime);
 
-            var occur_datas = conn.Query<dc_report_cash_flow_log>(occur_sql, parameters,commandTimeout:0).ToList();
-            var pay_datas = conn.Query<dc_report_cash_flow_log>(pay_sql, parameters, commandTimeout: 0).ToList();
+            var occur_datas = conn.Query<dc_report_cash_flow_group_day>(occur_sql, parameters,commandTimeout:0).ToList();
+            var pay_datas = conn.Query<dc_report_cash_flow_group_day>(pay_sql, parameters, commandTimeout: 0).ToList();
 
             var thisTime = btime;
             while (thisTime <= etime)
@@ -805,8 +805,8 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                         btime = bThisTime,
                         etime = eThisTime,
                         date_title = $"{bThisTime.Month}-{bThisTime.Day}",
-                        occur_val = occur_datas.Where(s => s.occur_time >= bThisTime && s.occur_time <= eThisTime && s.data_type == itemData.date_type).Sum(s => s.val),
-                        pay_val = pay_datas.Where(s => s.pay_time >= bThisTime && s.pay_time <= eThisTime && s.data_type == itemData.date_type).Sum(s => s.val)
+                        occur_val = occur_datas.Where(s => s.date >= bThisTime && s.date <= eThisTime && s.data_type == itemData.date_type).Sum(s => s.val),
+                        pay_val = pay_datas.Where(s => s.date >= bThisTime && s.date <= eThisTime && s.data_type == itemData.date_type).Sum(s => s.val)
                     });
                 }
 

AutoTurnOver.Models/Report/dc_report_cash_flow_group_day.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models.Report
+{
+    public class dc_report_cash_flow_group_day
+    {
+        public int id { get; set; }
+        public int year { get; set; }
+        public int month { get; set; }
+        public int day { get; set; }
+        public decimal val { get; set; }
+        public int data_type { get; set; }
+        public int type { get; set; }
+        public DateTime date { get; set; }
+    }
+}