记录索引键

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -66,6 +66,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后收,
                                 item_no = order_item.bailun_order_id
                             };
+                            item6.occur_time_year_month_no = $"{item6.occur_time.Year}-{item6.occur_time.Month}-{item6.bailun_sku}";
+                            item6.pay_time_year_month_no = $"{item6.pay_time.Year}-{item6.pay_time.Month}-{item6.bailun_sku}";
                             item6.pay_time = CalculationPayTime(configs, item6.occur_time, item6.data_type, item6.platform_type);
                             item6.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
                             {
@@ -102,6 +104,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后收,
                                 item_no = order_item.bailun_order_id
                             };
+                            item5.occur_time_year_month_no = $"{item5.occur_time.Year}-{item5.occur_time.Month}-{item5.bailun_sku}";
+                            item5.pay_time_year_month_no = $"{item5.pay_time.Year}-{item5.pay_time.Month}-{item5.bailun_sku}";
                             item5.pay_time = CalculationPayTime(configs, item5.occur_time, item5.data_type, item5.platform_type);
                             item5.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
                             {
@@ -138,6 +142,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.后付,
                                 item_no = order_item.bailun_order_id
                             };
+                            item3.occur_time_year_month_no = $"{item3.occur_time.Year}-{item3.occur_time.Month}-{item3.bailun_sku}";
+                            item3.pay_time_year_month_no = $"{item3.pay_time.Year}-{item3.pay_time.Month}-{item3.bailun_sku}";
                             item3.pay_time = CalculationPayTime(configs, item3.occur_time, item3.data_type, item3.platform_type);
                             item3.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
                             {
@@ -174,6 +180,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.实时,
                                 item_no = order_item.bailun_order_id
                             };
+                            item2.occur_time_year_month_no = $"{item2.occur_time.Year}-{item2.occur_time.Month}-{item2.bailun_sku}";
+                            item2.pay_time_year_month_no = $"{item2.pay_time.Year}-{item2.pay_time.Month}-{item2.bailun_sku}";
                             item2.pay_time = CalculationPayTime(configs, item2.occur_time, item2.data_type, item2.platform_type);
                             item2.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
                             {
@@ -210,6 +218,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.实时,
                                 item_no = order_item.bailun_order_id
                             };
+                            item1.occur_time_year_month_no = $"{item1.occur_time.Year}-{item1.occur_time.Month}-{item1.bailun_sku}";
+                            item1.pay_time_year_month_no = $"{item1.pay_time.Year}-{item1.pay_time.Month}-{item1.bailun_sku}";
                             item1.pay_time = CalculationPayTime(configs, item1.occur_time, item1.data_type, item1.platform_type);
                             item1.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
                             {
@@ -246,6 +256,8 @@ namespace AutoTurnOver.DB
                                 pay_type = (int)dc_report_cash_flow_log_pay_type_enum.实时,
                                 item_no = order_item.bailun_order_id
                             };
+                            item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.bailun_sku}";
+                            item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.bailun_sku}";
                             item.pay_time = CalculationPayTime(configs, item.occur_time, item.data_type, item.platform_type);
                             item.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
                             {
@@ -348,6 +360,8 @@ namespace AutoTurnOver.DB
                                 bailun_sku = order_item.bailun_sku
                             });
                             var remarks = "";
+                            item4.occur_time_year_month_no = $"{item4.occur_time.Year}-{item4.occur_time.Month}-{item4.bailun_sku}";
+                            item4.pay_time_year_month_no = $"{item4.pay_time.Year}-{item4.pay_time.Month}-{item4.bailun_sku}";
                             item4.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item4.occur_time, pick_data_logistics_order_id, out remarks);
                             item4.remarks = remarks;
                             item4.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
@@ -442,6 +456,8 @@ namespace AutoTurnOver.DB
                             {
                                 item.pay_time = order_item.pay_time ?? new DateTime(1991, 1, 1);
                             }
+                            item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.bailun_sku}";
+                            item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.bailun_sku}";
                             item.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 = item.data_type,
@@ -527,7 +543,8 @@ namespace AutoTurnOver.DB
                             };
 
                             item.pay_time = order_item.refund_time ?? new DateTime(1991, 1, 1);
-
+                            item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.bailun_sku}";
+                            item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.bailun_sku}";
                             item.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 = item.data_type,
@@ -618,6 +635,8 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
                                 item_no = order_item.transfer_order_id
                             };
                             var remarks = "";
+                            item.occur_time_year_month_no = $"{item.occur_time.Year}-{item.occur_time.Month}-{item.bailun_sku}";
+                            item.pay_time_year_month_no = $"{item.pay_time.Year}-{item.pay_time.Month}-{item.bailun_sku}";
                             item.pay_time = CalculationLogisticsPayTime(logisticsList, logistics_company_list, item.occur_time, order_item.logisticscode, out remarks);
                             item.remarks = remarks;
                             item.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
@@ -761,17 +780,18 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
         public static List<report_cash_flow_view_dto> GetView(report_cash_flow_view_search_dto search)
         {
             List<report_cash_flow_view_dto> datas = new List<report_cash_flow_view_dto>();
-            datas.Add(new report_cash_flow_view_dto { date_type = 1, date_type_str = "销售数量", remarks = "", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = 2, date_type_str = "销售金额", remarks = "", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = 3, date_type_str = "退款", remarks = "crm 抓取的退款数据，未区分仓库", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = 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 = 5, date_type_str = "平台费用", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            datas.Add(new report_cash_flow_view_dto { date_type = 6, date_type_str = "释放销售成本", remarks = "采购成本，利润中已经计算了", dates = new List<report_cash_flow_view_dto.date_dto>() });
-            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 = new List<int> { 1}, 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}, 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> { 3 }, date_type_str = "退款", remarks = "crm 抓取的退款数据，未区分仓库", 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> { 5 }, date_type_str = "平台费用", dates = new List<report_cash_flow_view_dto.date_dto>() });
+            datas.Add(new report_cash_flow_view_dto { date_type = new List<int> { 6 }, 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> { 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 = 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> { 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>() });
             var btime = DateTime.Now.AddDays(-8).ToDayHome();
             var etime = DateTime.Now.AddDays(-1).ToDayEnd();
             if (search.btime != null)
@@ -805,8 +825,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.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)
+                        occur_val = occur_datas.Where(s => s.date >= bThisTime && s.date <= eThisTime && itemData.date_type.Contains(s.data_type)).Sum(s => s.val),
+                        pay_val = pay_datas.Where(s => s.date >= bThisTime && s.date <= eThisTime && itemData.date_type.Contains(s.data_type)).Sum(s => s.val)
                     });
                 }
 
@@ -843,9 +863,9 @@ where t1.create_time>=@btime and t1.create_time<=@etime ";
             parameters.Add("btime",search.btime.Value.ToDayHome());
             parameters.Add("etime",search.etime.Value.ToDayEnd());
 
-            if (search.data_type > 0)
+            if (search.data_type !=null &&search.data_type.Count>=0)
             {
-                sql += " and t1.data_type=@data_type ";
+                sql += " and t1.data_type in @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

@@ -57,6 +57,8 @@ namespace AutoTurnOver.Models
         /// </summary>
         public int is_delete { get; set; }
         public DateTime? update_time { get; set; }
+        public string pay_time_year_month_no { get; set; }
+        public string occur_time_year_month_no { get; set; }
     }
 
     public class dc_report_cash_flow_log_dto: dc_report_cash_flow_log
@@ -148,7 +150,7 @@ namespace AutoTurnOver.Models
     {
         public string remarks { get; set; }
         public string date_type_str { get; set; }
-        public int date_type { get; set; }
+        public List<int> date_type { get; set; }
         public List<date_dto> dates { get; set; }
         public class date_dto
         {
@@ -171,7 +173,7 @@ namespace AutoTurnOver.Models
     {
         public DateTime? btime { get; set; }
         public DateTime? etime { get; set; }
-        public int? data_type { get; set; }
+        public List<int> data_type { get; set; }
         /// <summary>
         /// 1 = 根据发生时间查询
         /// 2 = 根据支付时间查询

AutoTurnOver.Services/CashFlowServices.cs

@@ -16,7 +16,7 @@ namespace AutoTurnOver.Services
             foreach (var item in order_list)
             {
                 dynamic o = new ExpandoObject();
-                o.date_type = item.date_type;
+                o.date_type = string.Join(",", item.date_type);
                 o.date_type_str = item.date_type_str;
                 o.remarks = item.remarks;
                 foreach (var dat_item in item.dates)
@@ -24,7 +24,7 @@ namespace AutoTurnOver.Services
                     var dic = (IDictionary<string, object>)o;
                     dic["occur_" + (dat_item.date_title)] = new { val = Math.Round(dat_item.occur_val, 2), btime = dat_item.btime, etime = dat_item.etime, data_type = item.date_type };
                     if(
-                        item.date_type == (int)dc_report_cash_flow_log_data_type_enum.销售数量
+                        item.date_type .Contains( (int)dc_report_cash_flow_log_data_type_enum.销售数量)
                         //|| item.date_type==(int)dc_report_cash_flow_log_data_type_enum.利润 
                         //|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.退款
                         //|| item.date_type == (int)dc_report_cash_flow_log_data_type_enum.平台费用

AutoTurnOver/Controllers/CashFlowController.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using AutoTurnOver.Common;
 using AutoTurnOver.Models;
 using AutoTurnOver.Services;
+using Dapper;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -32,11 +33,11 @@ namespace AutoTurnOver.Controllers
             });
         }
 
-        public FileResult Export(DateTime? btime, DateTime? etime, int? data_type = null,int? type = null)
+        public FileResult Export(DateTime? btime, DateTime? etime, string data_type = null,int? type = null)
         {
             var m = new dc_report_cash_flow_log_export_search_dto
             {
-                data_type = data_type,
+                data_type = string.IsNullOrWhiteSpace(data_type) ?new List<int> { } : data_type.Split(',').Select(s=>int.Parse(s)).ToList(),
                 btime = btime,
                 etime = etime,
                 type = type,