report接口增加 平台和分销类型的输出

molilian.api/Controllers/public/TkController.cs

@@ -87,7 +87,7 @@ namespace molilian.api.Controllers
             //oaid = "test-oaid";
 #endif
             return await UnionParseCore.UnionParseAsync(content, channel, ip, oaid, accountid);
-        }  
+        }
 
         [HttpPost]
         public async Task<ActionResult> unionCoupon([FromBody] JsonElement form, [FromQuery] string a = "", [FromQuery] int t = 0, [FromQuery] string sign = "")
@@ -263,7 +263,7 @@ namespace molilian.api.Controllers
                 result.deeplink_url,
             });
         }
-         
+
         [HttpGet]
         public ActionResult jd_parse(string s, string s2 = "", string ip = "", string oaid = "")
         {
@@ -520,9 +520,16 @@ namespace molilian.api.Controllers
 
             try
             {
+
+                //0:全分销类型;-1:各分销类型，1:goods 2: live 3:video 4: profile 5: unknown
+                int distributiontype = form.Read("distributiontype", 0);
+
+                //0:全平台;-1:各平台;1:淘宝 2:京东
+                int platform = form.Read("platform", 0);
+
                 var data = await ApiReportCore.ReportDailysAsync(form, clientIp, debug);
                 _ = log.Info(form.GetRawText(), data.Convert2Json()).SaveAsync();
-                return new APIResult(new { success = true, data });
+                return new APIResult(new { success = true, platform, distributiontype, data });
             }
             catch (Exception ex)
             {
@@ -542,9 +549,15 @@ namespace molilian.api.Controllers
 
             try
             {
+                //0:全分销类型;-1:各分销类型，1:goods 2: live 3:video 4: profile 5: unknown
+                int distributiontype = form.Read("distributiontype", 0);
+
+                //0:全平台;-1:各平台;1:淘宝 2:京东
+                int platform = form.Read("platform", 0);
+
                 var data = await ApiReportCore.ReportDailysAsync(form, clientIp, debug);
                 _ = log.Info(form.GetRawText(), data.Convert2Json()).SaveAsync();
-                return new APIResult(new { success = true, data });
+                return new APIResult(new { success = true, platform, distributiontype, data });
             }
             catch (Exception ex)
             {

molilian.core/Core/API/ApiReportCore.cs

@@ -46,7 +46,12 @@ namespace molilian.core
             //type可以不入参，留空就两个场景的数据都显示就行了
             //先只要成功的就行了，，到时候他们要明细再加就行了
 
+            //0:全分销类型;-1:各分销类型，1:goods 2: live 3:video 4: profile 5: unknown
             int distributiontype = form.Read("distributiontype", 0);
+
+            //0:全平台;-1:各平台;1:淘宝 2:京东
+            int platform = form.Read("platform", 0);
+
             int data_type = form.Read("type", 0);
             var report_date = form.PathReadArray<string>("query_date[]");
 
@@ -64,7 +69,7 @@ namespace molilian.core
                 case 1:
                 case 2:
                     {
-                        var data = await DataTypeReportDailysAsync(distributiontype, data_type, stime, etime, clientIp, debug);
+                        var data = await DataTypeReportDailysAsync(platform, distributiontype, data_type, stime, etime, clientIp, debug);
                         list.AddRange(data);
 
                     }
@@ -74,7 +79,7 @@ namespace molilian.core
                         int[] types = { 1, 2 };
                         foreach (var type in types)
                         {
-                            var data = await DataTypeReportDailysAsync(distributiontype, type, stime, etime, clientIp, debug);
+                            var data = await DataTypeReportDailysAsync(platform, distributiontype, type, stime, etime, clientIp, debug);
                             list.AddRange(data);
                         }
                     }
@@ -83,7 +88,7 @@ namespace molilian.core
             return list;
         }
 
-        public static async Task<List<dynamic>> DataTypeReportDailysAsync(int distributiontype, int data_type, DateTime stime, DateTime etime, string clientIp, bool debug = false)
+        public static async Task<List<dynamic>> DataTypeReportDailysAsync(int platform, int distributiontype, int data_type, DateTime stime, DateTime etime, string clientIp, bool debug = false)
         {
             string filter = "`is_show`=@is_show AND data_type=@data_type AND report_date>=@stime AND report_date<=@etime";
             string orderBy = "report_date DESC";