diff --git a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs index 36dd79f3..70009436 100644 --- a/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/Shop/ShopResponse.cs @@ -35,6 +35,21 @@ namespace BBWY.Client.Models public string DingDingKey { get; set; } public int SkuSafeTurnoverDays { get; set; } + + /// + /// 司南策略等级 + /// + public int SiNanPolicyLevel { get; set; } + + /// + /// 司南钉钉WebHook地址 + /// + public string SiNanDingDingWebHook { get; set; } + + /// + /// 司南钉钉密钥 + /// + public string SiNanDingDingKey { get; set; } } public class DepartmentResponse diff --git a/BBWY.Client/Models/Shop/Shop.cs b/BBWY.Client/Models/Shop/Shop.cs index c3709e5f..ca2d2e74 100644 --- a/BBWY.Client/Models/Shop/Shop.cs +++ b/BBWY.Client/Models/Shop/Shop.cs @@ -49,6 +49,21 @@ namespace BBWY.Client.Models public int SkuSafeTurnoverDays { get; set; } + /// + /// 司南策略等级 + /// + public int SiNanPolicyLevel { get; set; } + + /// + /// 司南钉钉WebHook地址 + /// + public string SiNanDingDingWebHook { get; set; } + + /// + /// 司南钉钉密钥 + /// + public string SiNanDingDingKey { get; set; } + public override string ToString() { return ShopName; diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index a6e122f2..4bdd34d1 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -209,10 +209,10 @@ namespace BBWY.Client.ViewModels //if (GlobalContext.User.TeamName == "刷单组") //{ - var shopList = new List(); - foreach (var d in departmentList) - shopList.AddRange(d.ShopList); - GlobalContext.User.ShopList = shopList; + var shopList = new List(); + foreach (var d in departmentList) + shopList.AddRange(d.ShopList); + GlobalContext.User.ShopList = shopList; //} } else @@ -247,6 +247,9 @@ namespace BBWY.Client.ViewModels shop.DingDingKey = s2.DingDingKey; shop.DingDingWebHook = s2.DingDingWebHook; shop.SkuSafeTurnoverDays = s2.SkuSafeTurnoverDays; + shop.SiNanPolicyLevel = s2.SiNanPolicyLevel; + shop.SiNanDingDingKey = s2.SiNanDingDingKey; + shop.SiNanDingDingWebHook = s2.SiNanDingDingWebHook; } } } diff --git a/BBWY.Server.Business/Vender/VenderBusiness.cs b/BBWY.Server.Business/Vender/VenderBusiness.cs index 9010d976..5b9a88d5 100644 --- a/BBWY.Server.Business/Vender/VenderBusiness.cs +++ b/BBWY.Server.Business/Vender/VenderBusiness.cs @@ -123,6 +123,9 @@ namespace BBWY.Server.Business .Set(s => s.DingDingKey, shopSettingRequest.DingDingKey) .Set(s => s.DingDingWebHook, shopSettingRequest.DingDingWebHook) .Set(s => s.SkuSafeTurnoverDays, shopSettingRequest.SkuSafeTurnoverDays) + .Set(s => s.SiNanDingDingKey, shopSettingRequest.SiNanDingDingKey) + .Set(s => s.SiNanDingDingWebHook, shopSettingRequest.SiNanDingDingWebHook) + .Set(s => s.SiNanPolicyLevel, shopSettingRequest.SiNanPolicyLevel) .ExecuteAffrows(); }); } @@ -151,6 +154,9 @@ namespace BBWY.Server.Business .Set(s => s.DingDingKey, shopSettingRequest.DingDingKey) .Set(s => s.DingDingWebHook, shopSettingRequest.DingDingWebHook) .Set(s => s.SkuSafeTurnoverDays, shopSettingRequest.SkuSafeTurnoverDays) + .Set(s => s.SiNanDingDingKey, shopSettingRequest.SiNanDingDingKey) + .Set(s => s.SiNanDingDingWebHook, shopSettingRequest.SiNanDingDingWebHook) + .Set(s => s.SiNanPolicyLevel, shopSettingRequest.SiNanPolicyLevel) .ExecuteAffrows(); }); } @@ -179,7 +185,10 @@ namespace BBWY.Server.Business s.PlatformId, s.DingDingKey, s.DingDingWebHook, - s.SkuSafeTurnoverDays + s.SkuSafeTurnoverDays, + s.SiNanDingDingKey, + s.SiNanDingDingWebHook, + s.SiNanPolicyLevel }).GroupBy(x => x.DepartmentId); if (relationGroups.Count() == 0) return null; @@ -206,7 +215,10 @@ namespace BBWY.Server.Business ShopType = x.ShopType, DingDingKey = x.DingDingKey, DingDingWebHook = x.DingDingWebHook, - SkuSafeTurnoverDays = x.SkuSafeTurnoverDays + SkuSafeTurnoverDays = x.SkuSafeTurnoverDays, + SiNanDingDingKey = x.SiNanDingDingKey, + SiNanDingDingWebHook = x.SiNanDingDingWebHook, + SiNanPolicyLevel = x.SiNanPolicyLevel }).ToList() }; departmentList.Add(department); diff --git a/BBWY.Server.Model/Db/Mds/Shops.cs b/BBWY.Server.Model/Db/Mds/Shops.cs index 3f1b1b15..61656471 100644 --- a/BBWY.Server.Model/Db/Mds/Shops.cs +++ b/BBWY.Server.Model/Db/Mds/Shops.cs @@ -122,6 +122,24 @@ namespace BBWY.Server.Model.Db.Mds /// [Column(StringLength = 100)] public string DingDingKey { get; set; } + + + /// + /// 司南策略等级 + /// + public int SiNanPolicyLevel { get; set; } + + /// + /// 司南钉钉WebHook地址 + /// + [Column(StringLength = 255)] + public string SiNanDingDingWebHook { get; set; } + + /// + /// 司南钉钉密钥 + /// + [Column(StringLength = 100)] + public string SiNanDingDingKey { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs b/BBWY.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs index ee164d84..058ae3fd 100644 --- a/BBWY.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs +++ b/BBWY.Server.Model/Dto/Request/Vender/ShopSettingRequest.cs @@ -36,5 +36,20 @@ namespace BBWY.Server.Model.Dto public string DingDingKey { get; set; } public int SkuSafeTurnoverDays { get; set; } + + /// + /// 司南策略等级 + /// + public int SiNanPolicyLevel { get; set; } + + /// + /// 司南钉钉WebHook地址 + /// + public string SiNanDingDingWebHook { get; set; } + + /// + /// 司南钉钉密钥 + /// + public string SiNanDingDingKey { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs b/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs index bcb3e16e..112af8ab 100644 --- a/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs +++ b/BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs @@ -50,6 +50,21 @@ namespace BBWY.Server.Model.Dto /// 钉钉密钥 /// public string DingDingKey { get; set; } + + /// + /// 司南策略等级 + /// + public int SiNanPolicyLevel { get; set; } + + /// + /// 司南钉钉WebHook地址 + /// + public string SiNanDingDingWebHook { get; set; } + + /// + /// 司南钉钉密钥 + /// + public string SiNanDingDingKey { get; set; } } public class PurchaseAccountResponse