fix reason错误；

增加subcode申明；

molilian.api/Controllers/public/TaskController.cs

@@ -478,41 +478,6 @@ namespace molilian.api.Controllers
         {
             string message = string.Empty;
 
-            var jd_list = new DBContext.Table("jd_pool").Where("", null).Select<JdPoolDTO>();
-            if (jd_list != null)
-            {
-                foreach (var account in jd_list)
-                {
-                    if (!account.status) continue;
-#if DEBUG
-                    if (account.id != 10) continue;
-#endif
-
-
-                    if (!string.IsNullOrEmpty(account.cookies))
-                    {
-                        try
-                        {
-                            var plus = new JdUnionPlus(account);
-                            _ = await plus.querySpreadEffectData(DateTime.Now.AddDays(-1));
-                            _ = await plus.queryEstimateCommList();
-                        }
-                        catch (Exception ex)
-                        {
-                            message = $"【JD报表接口异常】{account.id}:{account.name}\tquerySpreadEffectData\n{ex.Message}\n{ex.StackTrace}";
-                            NotifyCore.Notify(new NifyMessage
-                            {
-                                message = message,
-                                priority = NifyMessagePriority.high,
-                                tags = ["red_circle"]
-                            });
-                            continue;
-                        }
-                    }
-                }
-            }
-
-
             var list = TkPoolCore.List();
             if (list != null)
             {
@@ -550,6 +515,47 @@ namespace molilian.api.Controllers
             return new APIResult(new { success = true, message = "ok" });
         }
 
+        [HttpGet]
+        public async Task<ActionResult> JdSaveReport()
+        {
+            string message = string.Empty;
+
+            var jd_list = new DBContext.Table("jd_pool").Where("", null).Select<JdPoolDTO>();
+            if (jd_list != null)
+            {
+                foreach (var account in jd_list)
+                {
+                    if (!account.status) continue;
+#if DEBUG
+                    if (account.id != 10) continue;
+#endif
+
+
+                    if (!string.IsNullOrEmpty(account.cookies))
+                    {
+                        try
+                        {
+                            var plus = new JdUnionPlus(account);
+                            _ = await plus.querySpreadEffectData(DateTime.Now.AddDays(-1));
+                            _ = await plus.queryEstimateCommList();
+                        }
+                        catch (Exception ex)
+                        {
+                            message = $"【JD报表接口异常】{account.id}:{account.name}\tquerySpreadEffectData\n{ex.Message}\n{ex.StackTrace}";
+                            NotifyCore.Notify(new NifyMessage
+                            {
+                                message = message,
+                                priority = NifyMessagePriority.high,
+                                tags = ["red_circle"]
+                            });
+                            continue;
+                        }
+                    }
+                }
+            }
+            return new APIResult(new { success = true, message = "ok" });
+        }
+
         [HttpGet]
         public async Task<ActionResult> FixReport(int id, string dt)
         {

molilian.core/Core/taoke/UnionParseCore.cs

@@ -177,6 +177,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "初步筛选1";
+                    result.subCode = TkSubCodeEnum.Prelim1;
                     result.itemName = "";
                     result.deeplink_url = "";
                     _ = TkLogCore.ParseLogAsync(result);
@@ -200,6 +201,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "初步筛选1.5";
+                    result.subCode = TkSubCodeEnum.Prelim1_5;
                     result.itemName = "";
                     result.deeplink_url = "";
                     _ = TkLogCore.ParseLogAsync(result);
@@ -223,6 +225,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "初步筛选2";
+                    result.subCode = TkSubCodeEnum.Prelim2;
                     result.itemName = "点击打开淘宝APP";
                     _ = TkLogCore.ParseLogAsync(result);
 
@@ -245,6 +248,7 @@ namespace molilian.core
                     result.message = "放弃转链";
                     result.itemName = "点击打开淘宝APP";
                     result.reason = reason;
+                    result.subCode = TkSubCodeEnum.TrafficCtrl;
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
@@ -256,28 +260,6 @@ namespace molilian.core
                     });
                 }
 
-                ////============================== 放弃转链-初步筛选 ==============================
-                //bool is_ignore = AlimamaPlus.FirstFilterIgnoreRequest(content, out reason);
-
-                //if (string.IsNullOrEmpty(result.shortLinkurl) && is_ignore)
-                //{
-                //    //没有短链接都放弃
-                //    result.success = false;
-                //    result.message = "放弃转链";
-                //    result.itemName = "点击打开淘宝APP";
-                //    result.reason = "初步筛选";
-                //    _ = TkLogCore.ParseLogAsync(result);
-
-                //    return TaobaoParseOutput(result, swData, new
-                //    {
-                //        result.success,
-                //        result.message,
-                //        result.content,
-                //        result.itemName,
-                //        result.deeplink_url,
-                //    });
-                //}
-
                 //============================== 放弃转链-没有匹配账号 ==============================
                 TkPoolDTO? account = accountid > 0 ?
                     TkPoolCore.GetOne(accountid) :
@@ -287,6 +269,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "没有匹配账号";
+                    result.subCode = TkSubCodeEnum.Other;
                     result.itemName = "点击打开淘宝APP";
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
@@ -325,6 +308,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "请求超时";
+                    result.subCode = TkSubCodeEnum.Other;
                     result.itemName = "点击打开淘宝APP";
                 }
 
@@ -339,6 +323,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "请求超时";
+                    result.subCode = TkSubCodeEnum.Other;
                     result.itemName = "点击打开淘宝APP";
                 }
                 else
@@ -357,6 +342,7 @@ namespace molilian.core
                         tags = ["red_circle"]
                     });
                     result.success = false;
+                    result.subCode = TkSubCodeEnum.Other;
                     result.message = "转链接口异常";
                     result.itemName = "点击打开淘宝APP";
                 }

molilian.core/DTO/alimama/TkDataDTO.cs

@@ -2,6 +2,61 @@
 
 namespace molilian.core
 {
+    public enum TkSubCodeEnum
+    {
+        /// <summary>
+        /// 初筛1
+        /// </summary>
+        Prelim1 = 101,
+
+        /// <summary>
+        /// 初筛2
+        /// </summary>
+        Prelim2 = 102,
+
+        /// <summary>
+        /// 流量控制
+        /// </summary>
+        TrafficCtrl = 103,
+
+        /// <summary>
+        /// 非标链接
+        /// </summary>
+        NonStdLink = 104,
+
+        /// <summary>
+        /// 其他推广
+        /// </summary>
+        OtherPromo = 105,
+
+        /// <summary>
+        /// 链接不可转
+        /// </summary>
+        NoConvert = 106,
+
+        /// <summary>
+        /// 网络错误
+        /// </summary>
+        NetError = 107,
+
+        /// <summary>
+        /// 转链成功
+        /// </summary>
+        Success = 108,
+
+        /// <summary>
+        /// 其他
+        /// </summary>
+        Other = 109,
+
+        /// <summary>
+        /// 初筛1.5
+        /// </summary>
+        Prelim1_5 = 110,
+
+    }
+
+
     public class TkDataDTO
     {
         [Key]
@@ -45,7 +100,7 @@ namespace molilian.core
         [IgnoreInsert, IgnoreUpdate]
         public string couponEffectiveEndTime { get; set; } = string.Empty;
         public string end_point { get; set; } = string.Empty;
-        public int subCode { get; set; } = 0;
+        public TkSubCodeEnum subCode { get; set; } = TkSubCodeEnum.Other;
 
     }
 

molilian.core/Plus/Alimama/parse.cs

@@ -81,6 +81,7 @@ namespace molilian.core
                 result.success = false;
                 result.message = "放弃转链";
                 result.reason = "其他推广链接";
+                result.subCode = TkSubCodeEnum.OtherPromo;
                 result.accountName = string.Empty;
                 result.content = content;
                 result.deeplink_url = GetDeeplink(null);
@@ -114,6 +115,7 @@ namespace molilian.core
                 result.success = false;
                 result.message = "放弃转链";
                 result.reason = "其他推广链接";
+                result.subCode = TkSubCodeEnum.OtherPromo;
                 result.accountName = string.Empty;
                 result.content = content;
                 result.deeplink_url = GetDeeplink(null);
@@ -133,6 +135,8 @@ namespace molilian.core
                     case LinkTypeEnum.goods:
                         break;
                     default:
+                        result.reason = string.Empty;
+                        result.subCode = TkSubCodeEnum.NonStdLink;
                         return result;
                 }
             }
@@ -144,6 +148,7 @@ namespace molilian.core
                 result.success = false;
                 result.message = "放弃转链";
                 result.reason = reason;
+                result.subCode = TkSubCodeEnum.TrafficCtrl;
                 return result;
             }
 
@@ -497,6 +502,7 @@ namespace molilian.core
             return new TkDataDTO()
             {
                 message = string.Empty,
+                subCode = TkSubCodeEnum.Other,
                 channel = TkChannelEnum.tb,
                 accountName = string.Empty,
                 success = false,

molilian.core/Plus/Alimama/parse_2.cs

@@ -413,6 +413,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "其他推广链接";
+                    result.subCode = TkSubCodeEnum.OtherPromo;
                     result.link_type = LinkTypeEnum.other_aff;
                     result.shortLinkurl = url;
                     return result;
@@ -441,6 +442,7 @@ namespace molilian.core
                     result.success = false;
                     result.message = "放弃转链";
                     result.reason = "请求超时";
+                    result.subCode = TkSubCodeEnum.Other;
                     return result;
                 }
 
@@ -455,6 +457,7 @@ namespace molilian.core
                         result.success = false;
                         result.message = "放弃转链";
                         result.reason = "其他推广链接";
+                        result.subCode = TkSubCodeEnum.OtherPromo;
                         result.link_type = LinkTypeEnum.other_aff;
                         result.shortLinkurl = url;
                         return result;
@@ -478,6 +481,7 @@ namespace molilian.core
 
                 if ((result.content.Contains("霸下通用 web 页面-验证码")))
                 {
+                    result.subCode = TkSubCodeEnum.Other;
                     result.reason = "霸下验证码";
                 }
 
@@ -485,6 +489,7 @@ namespace molilian.core
                 result.success = false;
                 result.message = "放弃转链";
                 result.reason = "非标准链接";
+                result.subCode = TkSubCodeEnum.NonStdLink;
                 result.content = resultText;
                 result.link_type = link_type;
                 result.shortLinkurl = url;
@@ -500,6 +505,7 @@ namespace molilian.core
                 result.success = false;
                 result.message = "放弃转链";
                 result.reason = "排除淘口令";
+                result.subCode = TkSubCodeEnum.OtherPromo;
                 result.link_type = LinkTypeEnum.other_aff;
                 result.shortLinkurl = null;
                 return result;
@@ -511,6 +517,7 @@ namespace molilian.core
             result.success = false;
             result.message = "放弃转链";
             result.reason = "纯口令 没链接";
+            result.subCode = TkSubCodeEnum.OtherPromo;
             result.link_type = LinkTypeEnum.other_aff;
             result.shortLinkurl = null;
             return result;
@@ -681,7 +688,10 @@ namespace molilian.core
                     {
                         case "该商品已经下架或未加入淘宝客":
                         case "该链接不支持转化，请更换链接尝试":
+                            result.subCode = TkSubCodeEnum.NoConvert;
+                            break;
                         case "网络错误":
+                            result.subCode = TkSubCodeEnum.NetError;
                             break;
                         default:
                             var _headers = response.ResponseMessage.Headers;
@@ -706,6 +716,7 @@ namespace molilian.core
 
                 if (success)
                 {
+                    result.subCode = TkSubCodeEnum.Success;
                     switch (result.link_type)
                     {
                         case LinkTypeEnum.profile:
@@ -721,6 +732,8 @@ namespace molilian.core
 
                 result.success = success;
                 result.message = message;
+                result.reason = string.Empty;
+
                 result.content = content;
                 result.couponAmount = couponAmount;
                 result.couponEffectiveEndTime = couponEffectiveEndTime;