优化了微店商品上传 优化pdd买手读单

AllBase/AllBase.csproj

@@ -197,6 +197,7 @@
     <Compile Include="Model\Param\OutServerGoodsParam.cs" />
     <Compile Include="Model\Param\PDDProdParam\PDDActivitySubmitParamV2.cs" />
     <Compile Include="Model\Param\PDDProdParam\PddEditProdStockQuantity.cs" />
+    <Compile Include="Model\Param\PDDProdParam\PddRelationParam.cs" />
     <Compile Include="Model\Param\ToolsManage\ADSLAccountParam.cs" />
     <Compile Include="Model\Param\ToolsManage\ProductMappingExportInfo.cs" />
     <Compile Include="Model\Param\ToolsManage\ProductMappingImportParam.cs" />
@@ -213,6 +214,7 @@
     <Compile Include="Model\Result\PDDResult\PDDActivityResult\ActivityListProdInfo.cs" />
     <Compile Include="Model\Result\PDDResult\PDDActivityResult\ActEnrollV3GoodsRuleInfo.cs" />
     <Compile Include="Model\Result\PDDResult\PddBuyerOrderInfoLite.cs" />
+    <Compile Include="Model\Result\PDDResult\PddClientInfo.cs" />
     <Compile Include="Model\Result\VDianShopLoginInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXAddressInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXClientProductInfoLite.cs" />

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 979;
+        public static int VersionCount = 989;
         //public static int VersionCount = 613;
 
         /// <summary>

AllBase/BaseRegex.cs

@@ -681,6 +681,8 @@ namespace AllBase
 
         public static System.Collections.Generic.List<string> GetJsonObjStrJson(ref string html, string reg, int level = 0)
         {
+            var startTime = DateTime.Now;
+
             System.Collections.Generic.List<string> rstLst = new System.Collections.Generic.List<string>();
             if (html == null)
                 return rstLst;
@@ -716,6 +718,10 @@ namespace AllBase
                 //htmlTmp = htmlTmp.Substring(1);
                 if (braceNum == 0)
                 {
+                    var endTime1 = DateTime.Now;
+                    if ((endTime1 - startTime).TotalSeconds > 1)
+                    {
+                    }
                     rstLst.Add(htmlTmp.Substring(0, i + 1).Replace("\\这里是正花括号占位符", "\\{").Replace("\\这里是反花括号占位符", "\\}"));
                     htmlTmp = htmlTmp.Substring(i + 1);
                     //rstLst.Add(rst.Replace("\\这里是正花括号占位符", "\\{").Replace("\\这里是反花括号占位符", "\\}"));
@@ -729,11 +735,16 @@ namespace AllBase
             if (htmlTmp.Length > 0)
                 goto retry;
 
+            var endTime2 = DateTime.Now;
+            if ((endTime2 - startTime).TotalSeconds > 1)
+            {
+            }
             return rstLst;
         }
 
         public static System.Collections.Generic.List<string> GetJsonArrStrJson(ref string html, string reg)
         {
+            var startTime = DateTime.Now;
             System.Collections.Generic.List<string> rstLst = new System.Collections.Generic.List<string>();
             if (html == null)
                 return rstLst;
@@ -766,6 +777,10 @@ namespace AllBase
             if (htmlTmp.Length > 0)
                 goto retry;
 
+            var endTime = DateTime.Now;
+            if ((endTime - startTime).TotalSeconds > 1)
+            {
+            }
             return rstLst;
         }
 

AllBase/Helper/GlobalConfig.cs

@@ -3,6 +3,7 @@ using AllBase.Model.Param.ProductManage;
 using AllBase.Model.Param.ShopManage;
 using AllBase.Model.Param.TemuProductManage;
 using AllBase.Model.Result;
+using AllBase.Model.Result.PDDResult;
 using AllBase.Model.Result.WXResult;
 using LittleCow.Model.Param.WeiDianManage;
 using NaiBa.Util;
@@ -53,6 +54,11 @@ namespace AllBase.Helper
         /// 微店上货参数
         /// </summary>
         public static WeiDianSettingParam WeiDianUploadParam { get; set; }
+
+        /// <summary>
+        /// 拼多多api列表
+        /// </summary>
+        public static ConcurrentList<PddClientInfo> PddClentInfoList = new ConcurrentList<PddClientInfo>();
     }
 
     public enum ShopPlatform

AllBase/LogSave.cs

@@ -154,7 +154,7 @@ namespace AllBase
             BaseClass.ViewCode += message + "\r\n";
             if (Logs.Count > 5000)
             {
-                BaseClass.ViewCode += "日志队列超长，请检查日志处理\r\n";
+                //BaseClass.ViewCode += "日志队列超长，请检查日志处理\r\n";
                 Logs.Clear();
                 return;
             }

AllBase/Model/Param/PDDProdParam/PddRelationParam.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Param.PDDProdParam
+{
+    public class PddRelationParam
+    {
+        public string up_spu_id { get; set; } //  "88C9F35912594F76A21CDD5F36DAE972",
+        public string up_goods_name { get; set; } //  "婴儿衣服POLO衫短袖T恤0-3岁男童夏装宝宝女小童上衣儿童幼儿外出",
+        public string from_site { get; set; } // "vd",
+        public string goods_id { get; set; } //  "7735389957",
+        public string shop_id { get; set; } //  "1668907464",
+        public string price_min { get; set; } //  8941,
+        public string price_max { get; set; } //  8941,
+    }
+}

AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs

@@ -24,6 +24,7 @@ namespace AllBase.Model.Result.PDDResult
             {
                 if (outExpressCompanyMsg == null) return "";
                 if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "EMS";
+                if (outExpressCompanyMsg.Contains("邮政电商标快")) return "EMS";
                 if (outExpressCompanyMsg.Contains("极兔速递")) return "JTSD";
                 if (outExpressCompanyMsg.Contains("申通快递")) return "STO";
                 if (outExpressCompanyMsg.Contains("韵达快递")) return "YD";
@@ -39,6 +40,7 @@ namespace AllBase.Model.Result.PDDResult
             {
                 if (outExpressCompanyMsg == null) return "";
                 if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "邮政快递包裹";
+                if (outExpressCompanyMsg.Contains("邮政电商标快")) return "邮政电商标快";
                 if (outExpressCompanyMsg.Contains("极兔速递")) return "极兔速递";
                 if (outExpressCompanyMsg.Contains("申通快递")) return "申通快递";
                 if (outExpressCompanyMsg.Contains("韵达快递")) return "韵达快递";

AllBase/Model/Result/PDDResult/PddClientInfo.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.PDDResult
+{
+    public class PddClientInfo
+    {
+        public string describe { get; set; } // "小红椒商品管理"
+        public string client_id { get; set; } // "48ccccaaaa33335555ccccbbbb6666b5"
+        public string client_secret { get; set; } // "b2aaaaeeee6666222233332222ffff5555aaaa97"
+        public int? market_id { get; set; } // 84691
+        public string redirect_uri { get; set; } // "http%3A%2F%2Fxtjpd.aabbccddeeff.vip%2Fpdd_token.html"
+        public bool? is_current { get; set; } // "true"
+    }
+}

AllBase/Model/Result/ShopLoginInfo.cs

@@ -103,7 +103,7 @@ namespace AllBase.Model.Result
         public string RefreshToken { get { return (CurrentAuthInfo?.RefreshToken).ParseToString(); } }
         public string AppKey { get { return (CurrentAuthInfo?.AppKey).ParseToString(); } }
         public string AppSecret { get { return (CurrentAuthInfo?.AppSecret).ParseToString(); } }
-        public DateTime AuthAddTime { get { return CurrentAuthInfo?.AddTime == null ? new DateTime() : CurrentAuthInfo.AddTime; } }
+        public DateTime AuthUpdateTime { get { return CurrentAuthInfo?.UpdateTime == null ? new DateTime() : CurrentAuthInfo.UpdateTime; } }
         public DateTime AuthExpiresTime { get { return CurrentAuthInfo?.ExpiresTime == null ? new DateTime() : CurrentAuthInfo.ExpiresTime; } }
         /// <summary>
         /// 店铺运费模板
@@ -209,7 +209,7 @@ namespace AllBase.Model.Result
         public string AppKey { get; set; } = "";
         public string AppSecret { get; set; } = "";
         public DateTime ExpiresTime { get; set; }
-        public DateTime AddTime { get; set; } = DateTime.MinValue;
+        public DateTime UpdateTime { get; set; } = DateTime.MinValue;
         public string ApiAuthStatus { get; set; } = "未授权";
     }
 

AllBase/Model/Result/VDianShopLoginInfo.cs

@@ -8,6 +8,7 @@ namespace AllBase.Model.Result
 {
     public class VDianShopLoginInfo
     {
+        public int DbId { get; set; }
         public string user_name { get; set; }
 
         public string ShopName { get; set; }