邮件收件人增加国内发货人

ds-wms-service/DS.WMS.Core/Op/Entity/TaskInteraction/BusinessTaskMailReceiver.cs

@@ -74,17 +74,17 @@ namespace DS.WMS.Core.Op.Entity.TaskInteraction
         //[SugarColumn(ColumnDescription = "是否航空公司", DefaultValue = "0")]
         //public bool IsAirLines { get; set; }
 
-        ///// <summary>
-        ///// Desc:是否发货人
-        ///// </summary>
-        //[SugarColumn(ColumnDescription = "是否发货人", DefaultValue = "0")]
-        //public bool IsShipper { get; set; }
+        /// <summary>
+        /// Desc:是否发货人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否发货人", DefaultValue = "0")]
+        public bool IsShipper { get; set; }
 
-        ///// <summary>
-        ///// Desc:是否收货人
-        ///// </summary>
-        //[SugarColumn(ColumnDescription = "是否收货人", DefaultValue = "0")]
-        //public bool IsConsignee { get; set; }
+        /// <summary>
+        /// Desc:是否收货人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否收货人", DefaultValue = "0")]
+        public bool IsConsignee { get; set; }
 
         ///// <summary>
         ///// Desc:是否通知人
@@ -98,12 +98,6 @@ namespace DS.WMS.Core.Op.Entity.TaskInteraction
         //[SugarColumn(ColumnDescription = "是否仓库", DefaultValue = "0")]
         //public bool IsWareHouse { get; set; }
 
-        ///// <summary>
-        ///// Desc:是否码头
-        ///// </summary>
-        //[SugarColumn(ColumnDescription = "是否码头", DefaultValue = "0")]
-        //public bool IsWharf { get; set; }
-
         ///// <summary>
         ///// Desc:是否保险公司
         ///// </summary>
@@ -134,10 +128,10 @@ namespace DS.WMS.Core.Op.Entity.TaskInteraction
         //[SugarColumn(ColumnDescription = "是否经营单位", DefaultValue = "0")]
         //public bool IsEnterprise { get; set; }
 
-        ///// <summary>
-        ///// Desc:是否国内发货人
-        ///// </summary>
-        //[SugarColumn(ColumnDescription = "是否国内发货人", DefaultValue = "0")]
-        //public bool IsShipperCn { get; set; }
+        /// <summary>
+        /// Desc:是否国内发货人
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否国内发货人", DefaultValue = "0")]
+        public bool IsShipperCn { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/MailService.cs

@@ -257,6 +257,15 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
             if (mailConfig.Receiver.IsController)
                 receiverTypes.Add("controller");
 
+            if (mailConfig.Receiver.IsShipper)
+                receiverTypes.Add("shipper");
+
+            if (mailConfig.Receiver.IsShipperCn)
+                receiverTypes.Add("shippercn");
+
+            if (mailConfig.Receiver.IsConsignee)
+                receiverTypes.Add("consignee");
+
             templateModel.Receivers = await TenantDb.Queryable<BusinessOrderContact>().Where(x => receiverTypes.Contains(x.CustomerType)
                 && x.Email != null && x.Email != string.Empty && x.BusinessId == templateModel.BusinessId && x.BusinessType == templateModel.BusinessType)
                 .Select(x => new MailReceiver { DisplayName = x.Name, MailAddress = x.Email }).ToListAsync();