店铺优化功能优化

AllBase/AllBase.csproj

@@ -287,6 +287,7 @@
     <Compile Include="Model\Result\WXResult\GetCateOnShelfInfo.cs" />
     <Compile Include="Model\Result\WXResult\GetProdCateInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxCatInfo.cs" />
+    <Compile Include="Model\Result\WXResult\WxOptimizeExpressInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeOrderAfterSaleInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeProductEvaluationInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptrimizeLinerCgiInfo.cs" />

AllBase/BaseClass.cs

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

AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs

@@ -20,24 +20,31 @@ namespace AllBase.Model.Result.PDDResult
         //BTWL          百世快运
         //HTKY          百世快递
 
+        public static string GetWxExpressCompanyCode(string expressCompanyName)
+        {
+            if (expressCompanyName == null || expressCompanyName == "") return "";
+            if (expressCompanyName.Contains("邮政快递包裹")) return "EMS";
+            if (expressCompanyName.Contains("邮政电商标快")) return "EMS";
+            if (expressCompanyName.Contains("邮政EMS")) return "EMS";
+            if (expressCompanyName.Contains("极兔速递")) return "JTSD";
+            if (expressCompanyName.Contains("申通快递")) return "STO";
+            if (expressCompanyName.Contains("韵达快递")) return "YD";
+            if (expressCompanyName.Contains("圆通快递")) return "YTO";
+            if (expressCompanyName.Contains("中通快递")) return "ZTO";
+            if (expressCompanyName.Contains("百世快运")) return "BTWL";
+            if (expressCompanyName.Contains("百世快递")) return "HTKY";
+            if (expressCompanyName.Contains("顺丰速运")) return "SF";
+            if (expressCompanyName.Contains("京东快递")) return "JD";
+            if (expressCompanyName.Contains("京东快运")) return "JDKY";
+            return "";
+        }
+
         public string outExpressCompanyMsg { get; set; } // 物流公司名称，可以尝试直接从列表中匹配
         public string outExpressCompanyCode
         {
             get
             {
-                if (outExpressCompanyMsg == null || outExpressCompanyMsg == "") return "";
-                if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "EMS";
-                if (outExpressCompanyMsg.Contains("邮政电商标快")) return "EMS";
-                if (outExpressCompanyMsg.Contains("邮政EMS")) return "EMS";
-                if (outExpressCompanyMsg.Contains("极兔速递")) return "JTSD";
-                if (outExpressCompanyMsg.Contains("申通快递")) return "STO";
-                if (outExpressCompanyMsg.Contains("韵达快递")) return "YD";
-                if (outExpressCompanyMsg.Contains("圆通快递")) return "YTO";
-                if (outExpressCompanyMsg.Contains("中通快递")) return "ZTO";
-                if (outExpressCompanyMsg.Contains("百世快运")) return "BTWL";
-                if (outExpressCompanyMsg.Contains("百世快递")) return "HTKY";
-                if (outExpressCompanyMsg.Contains("顺丰")) return "SF";
-                return "";
+                return GetWxExpressCompanyCode(outExpressCompanyName);
             }
         }
         public string outExpressCompanyName
@@ -55,7 +62,9 @@ namespace AllBase.Model.Result.PDDResult
                 if (outExpressCompanyMsg.Contains("百世快运")) return "百世快运";
                 if (outExpressCompanyMsg.Contains("百世快递")) return "百世快递";
                 if (outExpressCompanyMsg.Contains("邮政EMS")) return "邮政EMS";
-                if (outExpressCompanyMsg.Contains("顺丰")) return "顺丰速运";
+                if (outExpressCompanyMsg.Contains("顺丰速运")) return "顺丰速运";
+                if (outExpressCompanyMsg.Contains("京东快递")) return "京东快递";
+                if (outExpressCompanyMsg.Contains("京东快运")) return "京东快运";
                 return "物流名称获取失败";
             }
         }

AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs

@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string optimizeWaybillId { get; set; }
+        public string optimizeTime { get; set; }
 
         public AfterSaleOrderInfo orderInfo { get; set; }
         public string reason { get; set; } // "生锈/弯曲变形/钝化不锋利"

AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs

@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string optimizeWaybillId { get; set; }
+        public string optimizeTime { get; set; }
 
         public WayBillOrderInfo orderInfo { get; set; }
         public string waybillId { get; set; } // "JT4157662637789",

AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs

@@ -10,6 +10,10 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string optimizeWaybillId { get; set; }
+        public string optimizeTime { get; set; }
+
+        public string order_id { get; set; }
 
         public string productEvaluationId { get; set; } // "53890834526",
         public OptimizeEvaluationInfo evaluationInfo { get; set; }

AllBase/Model/Result/WXResult/WxOptrimizeLinerCgiInfo.cs

@@ -10,6 +10,8 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string optimizeWaybillId { get; set; }
+        public string optimizeTime { get; set; }
 
         public string receipt_province { get; set; } // "福建省",
          public string ship_province { get; set; } // "广东省",