微信店铺重发优化功能

AllBase/AllBase.csproj

@@ -290,7 +290,7 @@
     <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" />
+    <Compile Include="Model\Result\WXResult\WxOptimizeLinerCgiInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOrderInfoLite.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeOrderWayBillInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXShopTokenInfo.cs" />

AllBase/BaseClass.cs

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

AllBase/Extension/Extensions.cs

@@ -66,6 +66,16 @@ namespace AllBase.Extension
                 {
                     return null;
                 }
+                try
+                {
+                    return DateTime.Parse(str);
+                }
+                catch
+                {
+                }
+
+                if (str.Contains("年") && str.Contains("月") && str.Contains("日") && !str.Contains("周"))
+                    str = str.Replace("年", "-").Replace("月", "-").Replace("日", "").Replace("时", ":").Replace("分", ":").Replace("秒", "").Trim(' ', ':');
                 if (str.Contains("-") || str.Contains("/"))
                 {
                     return DateTime.Parse(str);

AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs

@@ -20,7 +20,27 @@ namespace AllBase.Model.Result.PDDResult
         //BTWL          百世快运
         //HTKY          百世快递
 
-        public static string GetWxExpressCompanyCode(string expressCompanyName)
+        public static string GetPddToWxExpressCompanyCode(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 "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 static string GetWxExpressNameToWxExpressCode(string expressCompanyName)
         {
             if (expressCompanyName == null || expressCompanyName == "") return "";
             if (expressCompanyName.Contains("邮政快递包裹")) return "EMS";
@@ -28,8 +48,8 @@ namespace AllBase.Model.Result.PDDResult
             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 "YD";
+            if (expressCompanyName.Contains("圆通速递")) return "YTO";
             if (expressCompanyName.Contains("中通快递")) return "ZTO";
             if (expressCompanyName.Contains("百世快运")) return "BTWL";
             if (expressCompanyName.Contains("百世快递")) return "HTKY";
@@ -44,7 +64,7 @@ namespace AllBase.Model.Result.PDDResult
         {
             get
             {
-                return GetWxExpressCompanyCode(outExpressCompanyName);
+                return GetPddToWxExpressCompanyCode(outExpressCompanyName);
             }
         }
         public string outExpressCompanyName
@@ -55,6 +75,7 @@ namespace AllBase.Model.Result.PDDResult
                 if (outExpressCompanyMsg.Contains("邮政快递包裹")) return "邮政快递包裹";
                 if (outExpressCompanyMsg.Contains("邮政电商标快")) return "邮政电商标快";
                 if (outExpressCompanyMsg.Contains("极兔速递")) return "极兔速递";
+                if (outExpressCompanyMsg.Contains("极兔快递")) return "极兔速递";
                 if (outExpressCompanyMsg.Contains("申通快递")) return "申通快递";
                 if (outExpressCompanyMsg.Contains("韵达快递")) return "韵达快递";
                 if (outExpressCompanyMsg.Contains("圆通快递")) return "圆通快递";

AllBase/Model/Result/WXResult/WxOptimizeExpressInfo.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+    public class WxOptimizeExpressInfo
+    {
+        public int id { get; set; }
+        public string delivery_id { get; set; }
+        public string delivery_name { get; set; }
+        public string waybill_id { get; set; }
+        public int status { get; set; }
+        public string order_id { get; set; }
+        public string bind_order_id { get; set; }
+        public string shop_id { get; set; }
+        public DateTime add_time { get; set; }
+        public DateTime? use_time { get; set; }
+        public DateTime? waybill_pickup_time { get; set; }
+    }
+
+    public class WxOptimizeRstInfo
+    {
+        public int id { get; set; }
+        public string shop_id { get; set; }
+        public string order_id { get; set; }
+        public string optimize_rst { get; set; }
+        public string waybill_id { get; set; }
+        public string delivery_name { get; set; }
+        public DateTime add_time { get; set; }
+        public DateTime mdy_time { get; set; }
+    }
+}

AllBase/Model/Result/WXResult/WxOptimizeLinerCgiInfo.cs

@@ -6,15 +6,29 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.Result.WXResult
 {
-    public class WxOptrimizeLinerCgiInfo
+    public class WxOptimizeLinerCgiInfo
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
+        public int? orderTime { get; set; }
+        /// <summary>
+        /// 收货 省
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 收货 市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 收货 区
+        /// </summary>
+        public string district‌ { get; set; }
+
 
         public string receipt_province { get; set; } // "福建省",
-         public string ship_province { get; set; } // "广东省",
+        public string ship_province { get; set; } // "广东省",
         public string receipt_time { get; set; } // "1775439386",
         public string transport_duration { get; set; } // "120986",
         public string delivery_id { get; set; } // "ZTO",

AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs

@@ -12,6 +12,20 @@ namespace AllBase.Model.Result.WXResult
         public string shopName { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
+        public int? orderTime { get; set; }
+        /// <summary>
+        /// 收货 省
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 收货 市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 收货 区
+        /// </summary>
+        public string district‌ { get; set; }
+
 
         public AfterSaleOrderInfo orderInfo { get; set; }
         public string reason { get; set; } // "生锈/弯曲变形/钝化不锋利"

AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs

@@ -12,6 +12,20 @@ namespace AllBase.Model.Result.WXResult
         public string shopName { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
+        public int? orderTime { get; set; }
+        /// <summary>
+        /// 收货 省
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 收货 市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 收货 区
+        /// </summary>
+        public string district‌ { get; set; }
+
 
         public WayBillOrderInfo orderInfo { get; set; }
         public string waybillId { get; set; } // "JT4157662637789",

AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs

@@ -12,8 +12,21 @@ namespace AllBase.Model.Result.WXResult
         public string shopName { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
-
         public string order_id { get; set; }
+        public int? orderTime { get; set; }
+        /// <summary>
+        /// 收货 省
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 收货 市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 收货 区
+        /// </summary>
+        public string district‌ { get; set; }
+
 
         public string productEvaluationId { get; set; } // "53890834526",
         public OptimizeEvaluationInfo evaluationInfo { get; set; }