From abb2759bdf897bbd37a135af0df6e3373a1338ee Mon Sep 17 00:00:00 2001 From: wule Date: Sat, 26 Sep 2026 06:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=89=88=E6=9C=AC=E6=BC=8F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/Model/DBModel/oms_wei_order_info.cs | 14 +++++--- .../Model/DBModel/oms_wei_order_item_info.cs | 4 +-- AllBase/Model/Result/PddBuyerOrderLiteInfo.cs | 36 ++++++++++--------- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs index 9a04473..127619e 100644 --- a/AllBase/Model/DBModel/oms_wei_order_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_info.cs @@ -376,14 +376,20 @@ namespace AllBase.Model.DBModel set { this.SetValue(x => x.SyncLogisticsList, value); - SyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number; + RealSyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number; + SyncWaybillIdInfo = SyncLogisticsList.FirstOrDefault()?.tracking_number; SyncWaybillPickNo = SyncLogisticsList.FirstOrDefault()?.pickup_code; } } - public string SyncWaybillId + public string RealSyncWaybillId { - get { return this.GetValue(x => x.SyncWaybillId); } - set { this.SetValue(x => x.SyncWaybillId, value); } + get { return this.GetValue(x => x.RealSyncWaybillId); } + set { this.SetValue(x => x.RealSyncWaybillId, value); } + } + public string SyncWaybillIdInfo + { + get { return this.GetValue(x => x.SyncWaybillIdInfo); } + set { this.SetValue(x => x.SyncWaybillIdInfo, value); } } public string SyncWaybillPickNo { diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 0f8e0c2..04a4f8e 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -923,9 +923,9 @@ namespace AllBase.Model.DBModel this.SetValue(x => x.DirectPddBuyerOrder, value); SyncLogisticsMsg = DirectPddBuyerOrder?.sync_logistics_msg; // 有单号就不显示错误，否则单号字段显示错误信息 - if (ItemOrder.SyncWaybillId.IsNullOrEmpty()) + if (ItemOrder.SyncWaybillIdInfo.IsNullOrEmpty()) { - ItemOrder.SyncWaybillId = SyncLogisticsMsg; + ItemOrder.SyncWaybillIdInfo = SyncLogisticsMsg; SyncLogisticsMsg = ""; } else diff --git a/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs b/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs index 0d2ffff..04dc3e1 100644 --- a/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs +++ b/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs @@ -22,23 +22,23 @@ namespace AllBase.Model.Result public static string GetPddToTransitWarehouseExpressCompanyCode(string expressCompanyName) { if (expressCompanyName == null || expressCompanyName == "") return ""; - if (expressCompanyName.Contains("顺丰速运")) return "SF"; - if (expressCompanyName.Contains("邮政快递包裹")) return "EMS"; - if (expressCompanyName.Contains("邮政电商标快")) return "EMS"; - if (expressCompanyName.Contains("邮政EMS")) return "EMS"; - if (expressCompanyName.Contains("圆通快递")) return "YTO"; - if (expressCompanyName.Contains("圆通速递")) return "YTO"; - if (expressCompanyName.Contains("中通快递")) return "ZTO"; - if (expressCompanyName.Contains("百世快递")) return "HTKY"; - if (expressCompanyName.Contains("百世快运")) return "HTKY"; - if (expressCompanyName.Contains("申通快递")) return "STO"; - if (expressCompanyName.Contains("韵达快递")) return "YUNDA"; - if (expressCompanyName.Contains("韵达速递")) return "YUNDA"; - if (expressCompanyName.Contains("京东快递")) return "JDKD"; - if (expressCompanyName.Contains("京东快运")) return "JDKD"; - if (expressCompanyName.Contains("京东大件物流")) return "JDKD"; - if (expressCompanyName.Contains("极兔速递")) return "JTSD"; - if (expressCompanyName.Contains("极兔快递")) return "JTSD"; + if (expressCompanyName.Contains("顺丰速运") || expressCompanyName == "SF") return "SF"; + if (expressCompanyName.Contains("邮政快递包裹") || expressCompanyName == "EMS") return "EMS"; + if (expressCompanyName.Contains("邮政电商标快") || expressCompanyName == "EMS") return "EMS"; + if (expressCompanyName.Contains("邮政EMS") || expressCompanyName == "EMS") return "EMS"; + if (expressCompanyName.Contains("圆通快递") || expressCompanyName == "YTO") return "YTO"; + if (expressCompanyName.Contains("圆通速递") || expressCompanyName == "YTO") return "YTO"; + if (expressCompanyName.Contains("中通快递") || expressCompanyName == "ZTO") return "ZTO"; + if (expressCompanyName.Contains("百世快递") || expressCompanyName == "HTKY") return "HTKY"; + if (expressCompanyName.Contains("百世快运") || expressCompanyName == "HTKY") return "HTKY"; + if (expressCompanyName.Contains("申通快递") || expressCompanyName == "STO") return "STO"; + if (expressCompanyName.Contains("韵达快递") || expressCompanyName == "YUNDA") return "YUNDA"; + if (expressCompanyName.Contains("韵达速递") || expressCompanyName == "YUNDA") return "YUNDA"; + if (expressCompanyName.Contains("京东快递") || expressCompanyName == "JDKD") return "JDKD"; + if (expressCompanyName.Contains("京东快运") || expressCompanyName == "JDKD") return "JDKD"; + if (expressCompanyName.Contains("京东大件物流") || expressCompanyName == "JDKD") return "JDKD"; + if (expressCompanyName.Contains("极兔速递") || expressCompanyName == "JTSD") return "JTSD"; + if (expressCompanyName.Contains("极兔快递") || expressCompanyName == "JTSD") return "JTSD"; return "OTHER"; //SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔 } @@ -442,6 +442,8 @@ namespace AllBase.Model.Result if (outExpressCompanyMsg.Contains("京东快运")) return "京东快运"; if (outExpressCompanyMsg.Contains("京东大件物流")) return "京东大件物流"; if (outExpressCompanyMsg.Contains("其他快递")) return "其他快递"; + if (outExpressCompanyMsg.Length < 10) + return outExpressCompanyMsg; return "物流名称获取失败"; } }