From e025adb9df2698c9a815cdf0f36d3d4139f5c00a Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 9 Apr 2024 13:51:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.API/Controllers/OrderController.cs | 4 +--- BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs index 8a3b6a6..3ad0b07 100644 --- a/BBWYB.Server.API/Controllers/OrderController.cs +++ b/BBWYB.Server.API/Controllers/OrderController.cs @@ -147,9 +147,7 @@ namespace BBWYB.Server.API.Controllers /// 齐库推送sku配置状态 /// /// - [HttpPost] - [AllowAnonymous] - public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request) + [Ht([FromBody] QikuPublishOrderSkuPackConfigStateRequest request) { orderBusiness.QikuPublishOrderSkuPackConfigState(request); } diff --git a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs index a980dce..a230c5e 100644 --- a/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs +++ b/BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs @@ -318,7 +318,7 @@ namespace BBWYB.Server.Business //SkuId = waitCheckOrderSku.SkuId, TaskType = Enums.TimeLimitTaskType.待议价任务, TaskId = spuOptimizationTask.Id, - Remark = "首次采购限时任务" + Remark = $"{reason}限时任务" }); } #endregion From 6e9be9714b49405ea7a5b06abc942ee95da67b47 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 9 Apr 2024 13:54:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8D=A0=E7=94=A8=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseScheme/PurchaseSchemeBusiness.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs index 76daa53..6b2aebd 100644 --- a/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs +++ b/BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs @@ -369,8 +369,10 @@ namespace BBWYB.Server.Business }); var noCurrentBargainTeamList = dbPurchaserList.Where(dp => !string.IsNullOrEmpty(dp.BelongBargainTeamId) && dp.BelongBargainTeamId != uInfo.bargainTeam.Id).ToList(); + //if (noCurrentBargainTeamList.Count() > 0) + // throw new BusinessException($"不能包含被其他议价组使用的采购商 [{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}]"); if (noCurrentBargainTeamList.Count() > 0) - throw new BusinessException($"不能包含被其他议价组使用的采购商 [{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}]"); + throw new BusinessException($"该商品的供应商,已归属其他议价组.保存失败~!\r\n{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}"); } #endregion From 6051c7478ddf8f127eefeac826b07be32eecda0c Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 9 Apr 2024 13:56:05 +0800 Subject: [PATCH 3/4] 1 --- BBWYB.Server.API/Controllers/OrderController.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs index 3ad0b07..8a3b6a6 100644 --- a/BBWYB.Server.API/Controllers/OrderController.cs +++ b/BBWYB.Server.API/Controllers/OrderController.cs @@ -147,7 +147,9 @@ namespace BBWYB.Server.API.Controllers /// 齐库推送sku配置状态 /// /// - [Ht([FromBody] QikuPublishOrderSkuPackConfigStateRequest request) + [HttpPost] + [AllowAnonymous] + public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request) { orderBusiness.QikuPublishOrderSkuPackConfigState(request); } From 18c991b04f0f9c555e93b935359d75fc31bbf22f Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 9 Apr 2024 14:24:06 +0800 Subject: [PATCH 4/4] 10043 --- BBWYB.Client/App.xaml.cs | 5 ++- BBWYB.Client/GlobalContext.cs | 2 +- BBWYB.Client/ViewModels/WebVM.cs | 58 ++++++++++++++++++++------------ BBWYB.Client/Views/Web.xaml.cs | 8 ++--- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/BBWYB.Client/App.xaml.cs b/BBWYB.Client/App.xaml.cs index 5c620b5..ecd8de4 100644 --- a/BBWYB.Client/App.xaml.cs +++ b/BBWYB.Client/App.xaml.cs @@ -37,7 +37,10 @@ namespace BBWYB.Client //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY"; //议价2组 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNzYwOTcxNjg4OTY0NTI2MDgwIiwiZXhwIjoxNzQyNjMwODk0fQ.Vtq2MU1Qd9Oo192udkA01ZAwiQgQxj2m-pkayGZ1d3I"; + //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNzYwOTcxNjg4OTY0NTI2MDgwIiwiZXhwIjoxNzQyNjMwODk0fQ.Vtq2MU1Qd9Oo192udkA01ZAwiQgQxj2m-pkayGZ1d3I"; + + //齐越艾伦 + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjg2MTk4MzQzMjcwNjY2MjQwIiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNDU4NzAxNzE4MjI0MTEzNjY0LDE2MjAzNDIwMTQ3MDY5Nzg4MTYiLCJleHAiOjE3NDQxNzg3NjR9.lPHkPwG7inb_08T8aFDnPlSv7EKkWx7Jzp9R56DsAO4"; //拳探店铺 陈默 //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDM4Mjc0NzI1ODQ3MDQsMTYyMDM0NDAzMzczNTg3MjUxMiwxNjIwMzQ0MDkyODI5NDIxNTY4LDE2MjAzNDQxNDA4NTAwMDgwNjQiLCJleHAiOjE3MjA3NjQzMjV9.Q8fiKXCHgvzbm7NDEre-MeoSju_AmC6Ae6eDY22rUAw"; diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs index 2395bbb..5b4e14b 100644 --- a/BBWYB.Client/GlobalContext.cs +++ b/BBWYB.Client/GlobalContext.cs @@ -27,7 +27,7 @@ namespace BBWYB.Client { public GlobalContext() { - BBWYBApiVersion = "10042"; + BBWYBApiVersion = "10043"; } public List<_1688CookieModel> _1688CookieList { get; set; } = new List<_1688CookieModel>(); diff --git a/BBWYB.Client/ViewModels/WebVM.cs b/BBWYB.Client/ViewModels/WebVM.cs index a6eeee8..77e0706 100644 --- a/BBWYB.Client/ViewModels/WebVM.cs +++ b/BBWYB.Client/ViewModels/WebVM.cs @@ -51,29 +51,43 @@ namespace BBWYB.Client.ViewModels IList departmentList = null; + var response = mdsApiService.GetShopDetailList(); + if (!response.Success) + throw new Exception(response.Msg); + departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList(); + + + var res = shopService.GetDepartmentList(); + if (!res.Success) + throw new Exception(res.Msg); + var allDepartmentList = res.Data.Map>(); + var shopList = new List(); + foreach (var d in allDepartmentList) + shopList.AddRange(d.ShopList); + GlobalContext.User.ShopList = shopList; + + //if (managerDepartment.Contains(GlobalContext.User.TeamName) || + // managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m))) + //{ + // var res = shopService.GetDepartmentList(); + // if (!res.Success) + // throw new Exception(res.Msg); + // var allDepartmentList = res.Data.Map>(); - if (managerDepartment.Contains(GlobalContext.User.TeamName) || - managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m))) - { - var res = shopService.GetDepartmentList(); - if (!res.Success) - throw new Exception(res.Msg); - var allDepartmentList = res.Data.Map>(); - - - var shopList = new List(); - foreach (var d in allDepartmentList) - shopList.AddRange(d.ShopList); - GlobalContext.User.ShopList = shopList; - departmentList = allDepartmentList.Where(d => d.Name.Contains("供应链")).ToList(); - } - else - { - var response = mdsApiService.GetShopDetailList(); - if (!response.Success) - throw new Exception(response.Msg); - departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList(); - } + + // var shopList = new List(); + // foreach (var d in allDepartmentList) + // shopList.AddRange(d.ShopList); + // GlobalContext.User.ShopList = shopList; + // departmentList = allDepartmentList.Where(d => d.Name.Contains("供应链")).ToList(); + //} + //else + //{ + // var response = mdsApiService.GetShopDetailList(); + // if (!response.Success) + // throw new Exception(response.Msg); + // departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList(); + //} if (departmentList.Count == 0) throw new Exception("缺少有效的部门数据"); diff --git a/BBWYB.Client/Views/Web.xaml.cs b/BBWYB.Client/Views/Web.xaml.cs index de7075e..3fac9b6 100644 --- a/BBWYB.Client/Views/Web.xaml.cs +++ b/BBWYB.Client/Views/Web.xaml.cs @@ -52,10 +52,10 @@ namespace BBWYB.Client.Views private void initWebView() { #if DEBUG - //var url = "http://qtbbwy.qiyue666.com"; - //var registerName = "webContext"; - var url = "http://192.168.1.2:8080"; - var registerName = "webTestContext";//webTestContext + var url = "http://qtbbwy.qiyue666.com"; + var registerName = "webContext"; + //var url = "http://192.168.1.2:8080"; + //var registerName = "webTestContext";//webTestContext //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html"); #else var url = "http://qtbbwy.qiyue666.com";