fix

AutoTurnOver.DB/report_cash_flow_dao.cs

@@ -1177,14 +1177,33 @@ GROUP BY platform_type,website";
             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();
+            if (!string.IsNullOrWhiteSpace(search.bailun_sku))
+            {
+                occur_sql = " select occur_time as 'date',val,data_type,1 as 'type',platform_type,web_site from dc_report_cash_flow_log where is_delete=0 and occur_time >=@btime and occur_time<=@etime and bailun_sku=@bailun_sku and warehouse_code = @warehouse_code ";
+                pay_sql = " select pay_time as 'date',val,data_type,1 as 'type',platform_type,web_site from dc_report_cash_flow_log where is_delete=0 and pay_time >=@btime and pay_time<=@etime and bailun_sku=@bailun_sku and warehouse_code = @warehouse_code ";
+
+                parameters.Add("bailun_sku",search.bailun_sku);
+                parameters.Add("warehouse_code", search.warehouse_code);
+            }
+           
             parameters.Add("btime", btime);
             parameters.Add("etime", etime);
 
             if(!string.IsNullOrWhiteSpace(search.platform_type))
             {
-                occur_sql += " and platform_type=@platform_type ";
-                pay_sql += " and platform_type=@platform_type ";
-                parameters.Add("platform_type", search.platform_type);
+                if ("fba".Equals(search.platform_type,StringComparison.OrdinalIgnoreCase) || "amazon".Equals(search.platform_type, StringComparison.OrdinalIgnoreCase))
+                {
+                    occur_sql += " and platform_type in @platform_types ";
+                    pay_sql += " and platform_type in @platform_types ";
+                    parameters.Add("platform_types", new List<string> { "amazon","fba"});
+                }
+                else
+                {
+                    occur_sql += " and platform_type=@platform_type ";
+                    pay_sql += " and platform_type=@platform_type ";
+                    parameters.Add("platform_type", search.platform_type);
+                }
+                
             } 
             
             if(!string.IsNullOrWhiteSpace(search.web_site))
@@ -1194,6 +1213,12 @@ GROUP BY platform_type,website";
                 parameters.Add("web_site", search.web_site);
             }
 
+            if (!string.IsNullOrWhiteSpace(search.bailun_sku))
+            {
+                occur_sql += " GROUP BY occur_time_year_month_no,day(occur_time) ";
+                pay_sql += " GROUP BY pay_time_year_month_no,day(pay_time) ";
+            }
+
             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();
 

AutoTurnOver.Models/dc_report_cash_flow_log.cs

@@ -188,6 +188,8 @@ namespace AutoTurnOver.Models
         public DateTime? etime { get; set; }
         public string platform_type { get; set; }
         public string web_site { get; set; }
+        public string bailun_sku { get; set; }
+        public string warehouse_code { get; set; }
     }
 
     public class dc_report_cash_flow_log_export_search_dto

AutoTurnOver/Controllers/CashFlowController.cs

@@ -18,14 +18,16 @@ namespace AutoTurnOver.Controllers
     [ApiController]
     public class CashFlowController : ControllerBase
     {
-        public JsonResult GetView(DateTime? btime, DateTime? etime,string platform_type,string web_site)
+        public JsonResult GetView(DateTime? btime, DateTime? etime,string platform_type,string web_site,string bailun_sku, string warehouse_code)
         {
             report_cash_flow_view_search_dto search_data = new report_cash_flow_view_search_dto
             {
                 etime = etime,
                 btime = btime,
                 web_site = web_site,
-                platform_type = platform_type
+                platform_type = platform_type,
+                warehouse_code = warehouse_code,
+                bailun_sku = bailun_sku
             };
 
             var list = new CashFlowServices().GetView(search_data);