钉钉通知格式修改

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -16,6 +16,7 @@ using System.Text;
 using Yitter.IdGenerator;
 using BBWYB.Server.Business.Extensions;
 using Microsoft.Extensions.DependencyInjection;
+using BBWYB.Server.Model.Db.Mds;
 
 namespace BBWYB.Server.Business
 {
@@ -877,6 +878,7 @@ namespace BBWYB.Server.Business
                                                                            .ToOne((opi, o) => new Order
                                                                            {
                                                                                Id = o.Id,
+                                                                               OrderSn = o.OrderSn,
                                                                                OrderState = o.OrderState,
                                                                                ShopId = o.ShopId
                                                                            });
@@ -884,6 +886,12 @@ namespace BBWYB.Server.Business
                 throw new BusinessException("未查询到采购单的订单信息");
             #endregion
 
+            #region 店铺信息
+            var shop = fsqlManager.MDSfsql.Select<Shops>().Where(s => s.ShopId == dbOrder.ShopId.ToString()).ToOne();
+            if (shop == null)
+                throw new BusinessException("未查询到采购单所属店铺");
+            #endregion
+
             #region 查询订单的全部采购单信息
             var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.OrderId == dbOrder.Id && opi.IsEnabled == true).ToList();
             var orderPurchaseInfo = orderPurchaseInfoList.FirstOrDefault(opi => opi.PurchaseOrderId == request.PurchaseOrderId);
@@ -935,11 +943,13 @@ namespace BBWYB.Server.Business
                     #region 订阅失败发送钉钉通知
                     var dingdingMsg = new StringBuilder();
                     dingdingMsg.AppendLine($"错误:{ex.Message}");
-                    dingdingMsg.AppendLine($"1688订单号:{request.PurchaseOrderId}");
+                    dingdingMsg.AppendLine($"采购订单号:{request.PurchaseOrderId}");
                     dingdingMsg.AppendLine($"拳探订单号:{dbOrder.Id}");
+                    dingdingMsg.AppendLine($"拳探订单Sn:{dbOrder.OrderSn}");
                     dingdingMsg.AppendLine($"源物流公司:无");
                     dingdingMsg.AppendLine($"目标物流公司:{request.ExpressName} {request.ExpressId}");
-                    dingdingMsg.Append($"快递单号:${request.WaybillNo}");
+                    dingdingMsg.AppendLine($"快递单号:${request.WaybillNo}");
+                    dingdingMsg.Append($"店铺名:{shop.ShopName}");
                     SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString());
                     #endregion
                 }
@@ -1197,6 +1207,7 @@ namespace BBWYB.Server.Business
                                                                                .ToOne((opi, o) => new Order
                                                                                {
                                                                                    Id = o.Id,
+                                                                                   OrderSn = o.OrderSn,
                                                                                    OrderState = o.OrderState,
                                                                                    ShopId = o.ShopId
                                                                                });
@@ -1206,6 +1217,12 @@ namespace BBWYB.Server.Business
                 shopId = dbOrder.ShopId;
                 #endregion
 
+                #region 店铺信息
+                var shop = fsqlManager.MDSfsql.Select<Shops>().Where(s => s.ShopId == dbOrder.ShopId.ToString()).ToOne();
+                if (shop == null)
+                    throw new BusinessException("未查询到采购单所属店铺");
+                #endregion
+
                 #region 查询订单的全部采购单信息
                 currentProgress = "查询订单的全部采购单信息";
                 var orderPurchaseInfoList = fsql.Select<OrderPurchaseInfo>().Where(opi => opi.OrderId == orderId && opi.IsEnabled == true).ToList();
@@ -1259,7 +1276,7 @@ namespace BBWYB.Server.Business
                     {
                         kuaidi100Company = expressCompanyNameConverter.ConverterToKuaiDi100Company(logisticsInfo.ExpressName);
                         if (kuaidi100Company == null)
-                            throw new Exception($"快递100公司翻译失败 SourceExpressName:{logisticsInfo.ExpressName} 无翻译结果");
+                            throw new Exception($"无翻译结果");
                         kuaiDi100Manager.SubscribeKuaiDi100(logisticsInfo.WayBillNo, kuaidi100Company.TargetCode, "http://bbwyb.qiyue666.com/api/purchaseorder/kuaidi100publish");
                         isSubscribeKD100 = true;
                     }
@@ -1270,11 +1287,13 @@ namespace BBWYB.Server.Business
                         #region 订阅失败发送钉钉通知
                         var dingdingMsg = new StringBuilder();
                         dingdingMsg.AppendLine($"错误:{ex.Message}");
-                        dingdingMsg.AppendLine($"1688订单号:{purchaseOrderId}");
+                        dingdingMsg.AppendLine($"采购订单号:{purchaseOrderId}");
                         dingdingMsg.AppendLine($"拳探订单号:{orderId}");
+                        dingdingMsg.AppendLine($"拳探订单Sn:{dbOrder.OrderSn}");
                         dingdingMsg.AppendLine($"源物流公司:{logisticsInfo.ExpressName}");
                         dingdingMsg.AppendLine($"目标物流公司:{kuaidi100Company?.TargetName} {kuaidi100Company?.TargetCode}");
-                        dingdingMsg.Append($"快递单号:${logisticsInfo.WayBillNo}");
+                        dingdingMsg.AppendLine($"快递单号:${logisticsInfo.WayBillNo}");
+                        dingdingMsg.Append($"店铺名:${shop.ShopName}");
                         SendDingDingOnKD100SubscribeFail(dingdingMsg.ToString());
                         #endregion
                     }

BBWYB.Server.Business/Vender/VenderBusiness.cs

@@ -1,7 +1,7 @@
-using BBWY.Server.Model.Db.Mds;
-using BBWYB.Common.Log;
+using BBWYB.Common.Log;
 using BBWYB.Common.Models;
 using BBWYB.Server.Model;
+using BBWYB.Server.Model.Db.Mds;
 using BBWYB.Server.Model.Db.MDS;
 using BBWYB.Server.Model.Dto;
 using SDKAdapter.OperationPlatform.Client;

BBWYB.Server.Model/Db/MDS/Shops.cs

@@ -1,7 +1,6 @@
 using FreeSql.DataAnnotations;
-using System;
 
-namespace BBWY.Server.Model.Db.Mds
+namespace BBWYB.Server.Model.Db.Mds
 {
 
     [Table(Name = "shops", DisableSyncStructure = true)]