From b14dec05e514860e8a244ef20ede4a58bdd623d8 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 13 Jun 2023 10:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8F=91=E8=B4=A7=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E5=BF=AB=E9=80=92100=E5=A4=B1=E8=B4=A5=E4=B8=8D?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseOrder/PurchaseOrderBusiness.cs    | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index 97c23eb..1fefaa6 100644
--- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -917,8 +917,35 @@ namespace BBWYB.Server.Business
             #endregion
 
             #region 订阅快递100
+            bool isSubscribeKD100 = false;
             if (!isExists)
+            {
                 kuaiDi100Manager.SubscribeKuaiDi100(request.WaybillNo, request.ExpressId, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
+
+                #region 订阅快递100
+                try
+                {
+                    kuaiDi100Manager.SubscribeKuaiDi100(request.WaybillNo, request.ExpressId, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
+                    isSubscribeKD100 = true;
+                }
+                catch (Exception ex)
+                {
+                    nLogManager.Default().Error(ex, $"ManualDelivery,Request:{JsonConvert.SerializeObject(request)}");
+
+                    #region 订阅失败发送钉钉通知
+                    var dingdingMsg = new StringBuilder();
+                    dingdingMsg.AppendLine($"错误:{ex.Message}");
+                    dingdingMsg.AppendLine($"1688订单号:{request.PurchaseOrderId}");
+                    dingdingMsg.AppendLine($"拳探订单号:{dbOrder.Id}");
+                    dingdingMsg.AppendLine($"源物流公司:无");
+                    dingdingMsg.AppendLine($"目标物流公司:{request.ExpressName} {request.ExpressId}");
+                    dingdingMsg.Append($"快递单号:${request.WaybillNo}");
+                    SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString());
+                    #endregion
+                }
+                #endregion
+            }
+
             #endregion
 
             #region 创建快递单
@@ -933,7 +960,10 @@ namespace BBWYB.Server.Business
                     TargetExpressId = request.ExpressId,
                     TargetExpressName = request.ExpressName,
                     WaybillNo = request.WaybillNo,
-                    ExpressState = kuaiDi100Manager.GetExpressState(1)  //快递100发货状态值 默认揽收
+                    ExpressState = kuaiDi100Manager.GetExpressState(1),  //快递100发货状态值 默认揽收
+                    IsSubscribeKD100 = isSubscribeKD100,
+                    ExpressContent = "手动发货",
+                    ExpressChangedTime = DateTime.Now
                 };
                 insertPurchaseExpressOrderList.Add(purchaseExpressOrder);
             }
@@ -1214,7 +1244,6 @@ namespace BBWYB.Server.Business
                 wayBillNoResponseInfo = JsonConvert.SerializeObject(new { purchaseOrderId, logisticsList });
                 #endregion
 
-
                 #region 找出新发货的快递单
                 foreach (var logisticsInfo in logisticsList)
                 {