From 39f274b96e601f8496a1a1aa08552decc37fcb41 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sat, 10 Dec 2022 17:49:59 +0800 Subject: [PATCH] 1 --- BBWY.Client/APIServices/ShopService.cs | 10 ++- BBWY.Client/Models/Enums.cs | 5 ++ .../Setting/ShopSettingViewModel.cs | 23 +++++- BBWY.Client/Views/Setting/ShopSetting.xaml | 78 ++++++++++++++++++- 4 files changed, 110 insertions(+), 6 deletions(-) diff --git a/BBWY.Client/APIServices/ShopService.cs b/BBWY.Client/APIServices/ShopService.cs index 06d04e3c..5fefbb40 100644 --- a/BBWY.Client/APIServices/ShopService.cs +++ b/BBWY.Client/APIServices/ShopService.cs @@ -18,7 +18,10 @@ namespace BBWY.Client.APIServices PurchaseAccount purchaseAccount, string dingDingWebHook, string dingDingKey, - int skuSafeTurnoverDays) + int skuSafeTurnoverDays, + string siNanDingDingWebHook, + string siNanDingDingKey, + int siNanPolicyLevel) { if (skuSafeTurnoverDays == 0) { @@ -37,7 +40,10 @@ namespace BBWY.Client.APIServices purchaseAccount.PurchasePlatformId, dingDingWebHook, dingDingKey, - skuSafeTurnoverDays + skuSafeTurnoverDays, + siNanDingDingWebHook, + siNanDingDingKey, + siNanPolicyLevel }, null, HttpMethod.Post); } diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index f56d3139..b1c8e629 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -201,4 +201,9 @@ 客户无退货 = 3, 破损 = 4 } + + public enum SiNanPolicyLevel + { + 初级策略, 中级策略, 高级策略 + } } diff --git a/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs b/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs index 6ae0c1c3..215a8bae 100644 --- a/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs +++ b/BBWY.Client/ViewModels/Setting/ShopSettingViewModel.cs @@ -21,11 +21,14 @@ namespace BBWY.Client.ViewModels private string managePwd; private decimal platformCommissionRatio; private int panelIndex; - private int skuSafeTurnoverDays; private string dingDingWebHook; private string dingDingKey; private KVModel selectedSkuSafeTurnoverDay; + private string siNanDingDingWebHook; + private string siNanDingDingKey; + private SiNanPolicyLevel selectedSiNanPolicyLevel; + public ICommand SaveCommand { get; set; } public ICommand SetPanelIndexCommand { get; set; } @@ -40,12 +43,15 @@ namespace BBWY.Client.ViewModels public int PanelIndex { get => panelIndex; set { Set(ref panelIndex, value); } } public IList SafeDayList { get; set; } - public int SkuSafeTurnoverDays { get => skuSafeTurnoverDays; set { Set(ref skuSafeTurnoverDays, value); } } public string DingDingWebHook { get => dingDingWebHook; set { Set(ref dingDingWebHook, value); } } public string DingDingKey { get => dingDingKey; set { Set(ref dingDingKey, value); } } public KVModel SelectedSkuSafeTurnoverDay { get => selectedSkuSafeTurnoverDay; set { Set(ref selectedSkuSafeTurnoverDay, value); } } + public string SiNanDingDingWebHook { get => siNanDingDingWebHook; set { Set(ref siNanDingDingWebHook, value); } } + public string SiNanDingDingKey { get => siNanDingDingKey; set { Set(ref siNanDingDingKey, value); } } + public SiNanPolicyLevel SelectedSiNanPolicyLevel { get => selectedSiNanPolicyLevel; set { Set(ref selectedSiNanPolicyLevel, value); } } + public ShopSettingViewModel(GlobalContext globalContext, ShopService shopService) { PanelIndex = 0; @@ -99,6 +105,10 @@ namespace BBWY.Client.ViewModels DingDingKey = globalContext.User.Shop.DingDingKey; DingDingWebHook = globalContext.User.Shop.DingDingWebHook; SelectedSkuSafeTurnoverDay = SafeDayList.FirstOrDefault(s => s.Value == globalContext.User.Shop.SkuSafeTurnoverDays.ToString()); + + SelectedSiNanPolicyLevel = (SiNanPolicyLevel)globalContext.User.Shop.SiNanPolicyLevel; + SiNanDingDingKey = globalContext.User.Shop.SiNanDingDingKey; + SiNanDingDingWebHook = globalContext.User.Shop.SiNanDingDingWebHook; } protected override void Unload() @@ -140,7 +150,10 @@ namespace BBWY.Client.ViewModels PurchaseAccount, DingDingWebHook, DingDingKey, - int.Parse(SelectedSkuSafeTurnoverDay.Value))).ContinueWith(r => + int.Parse(SelectedSkuSafeTurnoverDay.Value), + SiNanDingDingWebHook, + SiNanDingDingKey, + (int)SelectedSiNanPolicyLevel)).ContinueWith(r => { IsLoading = false; var response = r.Result; @@ -160,6 +173,10 @@ namespace BBWY.Client.ViewModels globalContext.User.Shop.DingDingKey = this.DingDingKey; globalContext.User.Shop.DingDingWebHook = this.DingDingWebHook; globalContext.User.Shop.SkuSafeTurnoverDays = int.Parse(SelectedSkuSafeTurnoverDay.Value); + + globalContext.User.Shop.SiNanDingDingKey = this.DingDingKey; + globalContext.User.Shop.SiNanDingDingWebHook = this.DingDingWebHook; + globalContext.User.Shop.SiNanPolicyLevel = (int)this.SelectedSiNanPolicyLevel; }); } } diff --git a/BBWY.Client/Views/Setting/ShopSetting.xaml b/BBWY.Client/Views/Setting/ShopSetting.xaml index 7ccf8166..5b59f4a5 100644 --- a/BBWY.Client/Views/Setting/ShopSetting.xaml +++ b/BBWY.Client/Views/Setting/ShopSetting.xaml @@ -16,12 +16,16 @@ 0 1 2 - + + + + +