仓库退货订单逻辑 30%

AllBase/Model/Result/PddBuyerOrderLiteInfo.cs

@@ -72,7 +72,7 @@ namespace AllBase.Model.Result
             if (expressCompanyName.Contains("京东快运")) return "JDKY";
             if (expressCompanyName.Contains("京东大件物流")) return "JD";
             if (expressCompanyName.Contains("其他快递")) return "OTHER";
-            return "";
+            return "OTHER";
         }
 
         public static string GetWxExpressNameToWxExpressCode(string expressCompanyName)
@@ -92,9 +92,27 @@ namespace AllBase.Model.Result
             if (expressCompanyName.Contains("京东快递")) return "JD";
             if (expressCompanyName.Contains("京东快运")) return "JDKY";
             if (expressCompanyName.Contains("其他快递")) return "OTHER";
-            return "";
+            return "OTHER";
         }
 
+		public static string GetWxExpressCodeToWxExpressName(string expressCompanyCode)
+		{
+			if (expressCompanyCode == null || expressCompanyCode == "") return "";
+			if (expressCompanyCode.Contains("EMS")) return "邮政EMS";
+			if (expressCompanyCode.Contains("JTSD")) return "极兔速递";
+			if (expressCompanyCode.Contains("STO")) return "申通快递";
+			if (expressCompanyCode.Contains("YD")) return "韵达速递";
+			if (expressCompanyCode.Contains("YUNDA")) return "韵达速递";
+			if (expressCompanyCode.Contains("YTO")) return "圆通速递";
+			if (expressCompanyCode.Contains("ZTO")) return "中通快递";
+			if (expressCompanyCode.Contains("BTWL")) return "百世快运";
+			if (expressCompanyCode.Contains("顺丰速运")) return "SF";
+			if (expressCompanyCode.Contains("京东快递")) return "JD";
+			if (expressCompanyCode.Contains("京东快运")) return "JDKY";
+			if (expressCompanyCode.Contains("其他快递")) return "OTHER";
+			return "其他快递";
+		}
+
         /// <summary>
         /// 发货类型 直发/中转
         /// </summary>
@@ -380,8 +398,19 @@ namespace AllBase.Model.Result
                 //return GetPddToWxExpressCompanyCode(outExpressCompanyName);
                 return GetPddToTransitWarehouseExpressCompanyCode(outExpressCompanyName);
             }
-        }
-        public string outExpressCompanyName
+		}
+		/// <summary>
+		/// 外采订单物流名称对应微信物流公司编码
+		/// </summary>
+		[JsonIgnore]
+		public string outPddToWxExpressCompanyCode
+		{
+			get
+			{
+				return GetPddToWxExpressCompanyCode(outExpressCompanyName);
+			}
+		}
+		public string outExpressCompanyName
         {
             get
             {