From a6ab8cf21ff201c5a6b9470701353e286f36ce04 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Fri, 8 Sep 2023 23:23:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=95=88?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...IbgUniversalJosServiceOrderQueryRequest.cs | 356 +++++++++--------- ...rviceQuerySendTemplateByCategoryRequest.cs | 21 ++ ...viceQuerySendTemplateByCategoryResponse.cs | 11 + .../PlatformSDK/JDBusiness.cs | 27 +- 4 files changed, 236 insertions(+), 179 deletions(-) create mode 100644 BBWY.JDSDK/Request/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest.cs create mode 100644 BBWY.JDSDK/Response/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse.cs diff --git a/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceOrderQueryRequest.cs b/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceOrderQueryRequest.cs index 36dfb1c2..e2e4f286 100644 --- a/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceOrderQueryRequest.cs +++ b/BBWY.JDSDK/Request/AdsIbgUniversalJosServiceOrderQueryRequest.cs @@ -6,193 +6,193 @@ namespace Jd.Api.Request { public class AdsIbgUniversalJosServiceOrderQueryRequest : JdRequestBase { - public string - clickStartDay - {get; set;} - - public string - orderType - {get; set;} - - public string - orderStartDay - {get; set;} - - public string - orderStatus - {get; set;} - - public string - pageSize - {get; set;} - - public string - platform - {get; set;} - - public string - adGroupId - {get; set;} - - public string - paymentType - {get; set;} - - public string - activityId - {get; set;} - - public string - mediaGroupId - {get; set;} - - public string - province - {get; set;} - - public string - clickOrOrderDay - {get; set;} - - public string - clickOrOrderCaliber - {get; set;} - - public string - orderEndDay - {get; set;} - - public string - clickEndDay - {get; set;} - - public string - giftFlag - {get; set;} - - public string - campaignId - {get; set;} - - public string - deliveryType - {get; set;} - - public string - mediaType - {get; set;} - - public string - impressionOrClickEffect - {get; set;} - - public string - posPackageId - {get; set;} - - public string - page - {get; set;} - - public string - startDay - {get; set;} - - public string - endDay - {get; set;} - - public string - myself - {get; set;} - - public string - businessType - {get; set;} - - public string - accessPin - {get; set;} - - public string - authType - {get; set;} - - public string - deliverySystemType - {get; set;} - - public string - jdMediaUserId - {get; set;} - - public override string ApiName - { - get{return "jingdong.ads.ibg.UniversalJosService.order.query";} - } - protected override void PrepareParam(IDictionary parameters) - { - parameters.Add("clickStartDay", this. clickStartDay -); - parameters.Add("orderType", this. orderType -); - parameters.Add("orderStartDay", this. orderStartDay -); - parameters.Add("orderStatus", this. orderStatus -); - parameters.Add("pageSize", this. pageSize -); - parameters.Add("platform", this. platform -); - parameters.Add("adGroupId", this. adGroupId -); - parameters.Add("paymentType", this. paymentType -); - parameters.Add("activityId", this. activityId -); - parameters.Add("mediaGroupId", this. mediaGroupId -); - parameters.Add("province", this. province -); - parameters.Add("clickOrOrderDay", this. clickOrOrderDay -); - parameters.Add("clickOrOrderCaliber", this. clickOrOrderCaliber -); - parameters.Add("orderEndDay", this. orderEndDay -); - parameters.Add("clickEndDay", this. clickEndDay -); - parameters.Add("giftFlag", this. giftFlag -); - parameters.Add("campaignId", this. campaignId -); - parameters.Add("deliveryType", this. deliveryType -); - parameters.Add("mediaType", this. mediaType -); - parameters.Add("impressionOrClickEffect", this. impressionOrClickEffect + public string +clickStartDay + { get; set; } + + public string +orderType + { get; set; } + + public string +orderStartDay + { get; set; } + + public string +orderStatus + { get; set; } + + public string +pageSize + { get; set; } + + public string +platform + { get; set; } + + public string +adGroupId + { get; set; } + + public string +paymentType + { get; set; } + + public string +activityId + { get; set; } + + public string +mediaGroupId + { get; set; } + + public string +province + { get; set; } + + public string +clickOrOrderDay + { get; set; } + + public string +clickOrOrderCaliber + { get; set; } + + public string +orderEndDay + { get; set; } + + public string +clickEndDay + { get; set; } + + public string +giftFlag + { get; set; } + + public string +campaignId + { get; set; } + + public string +deliveryType + { get; set; } + + public string +mediaType + { get; set; } + + public string +impressionOrClickEffect + { get; set; } + + public string +posPackageId + { get; set; } + + public string +page + { get; set; } + + public string +startDay + { get; set; } + + public string +endDay + { get; set; } + + public string +myself + { get; set; } + + public string +businessType + { get; set; } + + public string +accessPin + { get; set; } + + public string +authType + { get; set; } + + public string +deliverySystemType + { get; set; } + + public string +jdMediaUserId + { get; set; } + + public override string ApiName + { + get { return "jingdong.ads.ibg.UniversalJosService.order.query"; } + } + protected override void PrepareParam(IDictionary parameters) + { + parameters.Add("clickStartDay", this.clickStartDay +); + parameters.Add("orderType", this.orderType +); + parameters.Add("orderStartDay", this.orderStartDay +); + parameters.Add("orderStatus", this.orderStatus +); + parameters.Add("pageSize", this.pageSize +); + parameters.Add("platform", this.platform +); + parameters.Add("adGroupId", this.adGroupId +); + parameters.Add("paymentType", this.paymentType +); + parameters.Add("activityId", this.activityId +); + parameters.Add("mediaGroupId", this.mediaGroupId ); - parameters.Add("posPackageId", this. posPackageId + parameters.Add("province", this.province ); - parameters.Add("page", this. page + parameters.Add("clickOrOrderDay", this.clickOrOrderDay ); - parameters.Add("startDay", this. startDay + parameters.Add("clickOrOrderCaliber", this.clickOrOrderCaliber ); - parameters.Add("endDay", this. endDay + parameters.Add("orderEndDay", this.orderEndDay ); - parameters.Add("myself", this. myself + parameters.Add("clickEndDay", this.clickEndDay ); - parameters.Add("businessType", this. businessType + parameters.Add("giftFlag", this.giftFlag ); - parameters.Add("accessPin", this. accessPin + parameters.Add("campaignId", this.campaignId ); - parameters.Add("authType", this. authType + parameters.Add("deliveryType", this.deliveryType ); - parameters.Add("deliverySystemType", this. deliverySystemType + parameters.Add("mediaType", this.mediaType ); - parameters.Add("jdMediaUserId", this. jdMediaUserId + parameters.Add("impressionOrClickEffect", this.impressionOrClickEffect ); - } + parameters.Add("posPackageId", this.posPackageId +); + parameters.Add("page", this.page +); + parameters.Add("startDay", this.startDay +); + parameters.Add("endDay", this.endDay +); + parameters.Add("myself", this.myself +); + parameters.Add("businessType", this.businessType +); + parameters.Add("accessPin", this.accessPin +); + parameters.Add("authType", this.authType +); + parameters.Add("deliverySystemType", this.deliverySystemType +); + parameters.Add("jdMediaUserId", this.jdMediaUserId +); + } } } @@ -200,6 +200,6 @@ namespace Jd.Api.Request - - + + diff --git a/BBWY.JDSDK/Request/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest.cs b/BBWY.JDSDK/Request/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest.cs new file mode 100644 index 00000000..66b62670 --- /dev/null +++ b/BBWY.JDSDK/Request/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest.cs @@ -0,0 +1,21 @@ +using BBWY.JDSDK.Response; +using Jd.Api; +using System.Collections.Generic; + +namespace BBWY.JDSDK.Request +{ + public class SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest : JdRequestBase + { + public override string ApiName => "jingdong.seller.delivery.SendPromiseTemplateJsfService.querySendTemplateByCategory"; + + public int categoryId { get; set; } + + public bool dzSku { get; set; } + + protected override void PrepareParam(IDictionary paramters) + { + paramters.Add("categoryId", this.categoryId); + paramters.Add("dzSku", this.dzSku); + } + } +} diff --git a/BBWY.JDSDK/Response/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse.cs b/BBWY.JDSDK/Response/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse.cs new file mode 100644 index 00000000..aa9eaabf --- /dev/null +++ b/BBWY.JDSDK/Response/SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse.cs @@ -0,0 +1,11 @@ +using Jd.Api; +using System; +using System.Collections.Generic; +using System.Text; + +namespace BBWY.JDSDK.Response +{ + public class SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse: JdResponse + { + } +} diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index 5ef4b0a0..a5f0929c 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -1,5 +1,6 @@ using BBWY.Common.Extensions; using BBWY.Common.Models; +using BBWY.JDSDK.Request; using BBWY.Server.Model; using BBWY.Server.Model.Dto; using Jd.ACES; @@ -1071,8 +1072,32 @@ namespace BBWY.Server.Business (string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg); if (errorMsg.Contains("此类目发货时效必填")) { + int? promiseId = null; + #region 查询时效模板 + { + var shixiaoReq = new SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryRequest(); + shixiaoReq.categoryId = int.Parse(request.MainProductCategoryId); + shixiaoReq.dzSku = true; + var shixiaoRes = jdClient.Execute(shixiaoReq, request.AppToken, DateTime.Now.ToLocalTime()); + if (shixiaoRes.IsError) + { + RollBackWhenStartPromotionError(request.AppKey, request.AppSecret, request.AppToken, null, request.MainProductSpu, request.FullTitle, brandName, false); + throw new BusinessException($"查询时效模板失败-{(string.IsNullOrEmpty(shixiaoRes.ErrorMsg) ? shixiaoRes.ErrMsg : shixiaoRes.ErrorMsg)}"); + } + if (shixiaoRes.Json == null) + shixiaoRes.Json = JObject.Parse(shixiaoRes.Body); + var shixiaoJToken = shixiaoRes.Json["jingdong_seller_delivery_SendPromiseTemplateJsfService_querySendTemplateByCategory_responce"]["returnType"]["bizResponse"]["promiseTemplateDtoList"].Children().FirstOrDefault(); + if (shixiaoJToken == null) + { + RollBackWhenStartPromotionError(request.AppKey, request.AppSecret, request.AppToken, null, request.MainProductSpu, request.FullTitle, brandName, false); + throw new BusinessException($"查询时效模板失败-未查询到时效模板"); + } + promiseId = shixiaoJToken.Value("templateId"); + } + #endregion + foreach (var skuParam in req.skus) - skuParam.promiseId = 30603710; + skuParam.promiseId = promiseId; res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime()); if (res.IsError) { From c52d80db2640eebf0f07fdaf1d637d193689b82f Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 10 Sep 2023 10:09:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BatchPurchase/BatchPurchaseBusiness.cs | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index 7e4cdc4b..cf016e71 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -1047,27 +1047,29 @@ namespace BBWY.Server.Business var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform); var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request); - if (payOrderResponse.Success)//取消成功 + if (!payOrderResponse.Success)//取消成功 { - //var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); - fsql.Update(request.OrderId) - .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消) - .ExecuteAffrows(); - try - { - var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/", - $"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}", - null, - null, - HttpMethod.Post); - if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK) - throw new Exception(qikuResponse.Content); - } - catch (Exception ex) - { - nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request)); - } + if (!payOrderResponse.Msg.Contains("订单已删除")) + throw new BusinessException(payOrderResponse.Msg); + } + //var order = fsql.Select().Where(p => p.Id == request.OrderId).ToOne(); + fsql.Update(request.OrderId) + .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消) + .ExecuteAffrows(); + try + { + var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/", + $"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}", + null, + null, + HttpMethod.Post); + if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK) + throw new Exception(qikuResponse.Content); + } + catch (Exception ex) + { + nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request)); } } From 30b32aa5ad52c3852a7ddf35038269ef49c039f6 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 12 Sep 2023 14:51:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=BB=B6=E9=95=BF60s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EvaluationAssistant/EvaluationAssistantBusiness.cs | 2 +- BBWY.Server.Business/PlatformSDK/JDBusiness.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs index 01c1a1bf..0e100438 100644 --- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs +++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs @@ -654,7 +654,7 @@ namespace BBWY.Server.Business MainProductSpu = promotionTask.MainProductSpu, HaveGiftTemplate = promotionTask.GiftTemplateId != null && promotionTask.GiftTemplateId != 0, DeleteGiftSkuList = startResponse.DeleteGiftSkuList - }, GetYunDingRequestHeader(), HttpMethod.Post, timeOutSeconds: 150); + }, GetYunDingRequestHeader(), HttpMethod.Post, timeOutSeconds: 300); var errorBack = new Action((id, errorMsg) => { diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs index a5f0929c..8b3effa0 100644 --- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs +++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs @@ -968,6 +968,9 @@ namespace BBWY.Server.Business var response = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime()); if (response.Json == null) response.Json = JObject.Parse(response.Body); + + nLogManager.Default().Info($"获取销售属性 任务Id {request.Id} 返回内容 {response.Body} 模板sku数量 {request.GiftTemplateSkuList.Count()}"); + var colorProperty = response.Json["jingdong_category_read_findAttrsByCategoryIdUnlimitCate_responce"]["findattrsbycategoryidunlimitcate_result"].FirstOrDefault(j => j["attrValueList"] != null && j["attrValueList"].Count() > 0); if (colorProperty == null) { @@ -1289,7 +1292,7 @@ namespace BBWY.Server.Business public override void StartJDPromotionDelayTask(StartPromotionTaskDelayRequest request) { - Thread.Sleep(30 * 1000); + Thread.Sleep(60 * 1000); try { CheckJDPromotionTask(request.JDPromotionId, request.AppKey, request.AppSecret, request.AppToken); From e4843c9bd719b3c05609d96ecc22a42dc8784246 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Wed, 13 Sep 2023 17:51:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=80=E6=94=BE=E4=BF=AE=E6=94=B9bbwy?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E9=93=BE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/App.xaml.cs | 6 ++--- BBWY.Client/ViewModels/MainViewModel.cs | 32 +++++++++++++++---------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 6aa4f7fb..83bb5268 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -53,14 +53,14 @@ namespace BBWY.Client //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek"; //齐越梧桐 - //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE"; //齐越山鸡 - userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; + // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw"; //齐越陈默 - //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM"; + userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM"; #else //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty; diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index c1890a33..9dedb8f3 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -310,23 +310,32 @@ namespace BBWY.Client.ViewModels CreateMenu(); + + + + + IList departmentList = null; + var response1 = shopService.GetDepartmentList(); + if (!response1.Success) + throw new Exception(response1.Msg); + departmentList = response1.Data.Map>(); + + //if (GlobalContext.User.TeamName == "刷单组") + //{ + var shopList = new List(); + foreach (var d in departmentList) + shopList.AddRange(d.ShopList); + GlobalContext.User.ShopList = shopList; + + + if (GlobalContext.User.TeamName == "刷单组" || this.packDepartment.Contains(GlobalContext.User.TeamName) || packDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)) || managerDepartment.Contains(GlobalContext.User.TeamName) || managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m))) { ShowShopChoosePanel = true; - var response = shopService.GetDepartmentList(); - if (!response.Success) - throw new Exception(response.Msg); - departmentList = response.Data.Map>(); - - //if (GlobalContext.User.TeamName == "刷单组") - //{ - var shopList = new List(); - foreach (var d in departmentList) - shopList.AddRange(d.ShopList); - GlobalContext.User.ShopList = shopList; + //} } else @@ -337,7 +346,6 @@ namespace BBWY.Client.ViewModels departmentList = response.Data; if (departmentList.Count == 0) throw new Exception("缺少有效的部门数据"); - var shopIds = new List(); foreach (var d in departmentList) { From 097408c63784607bafe03b031447da05927d2964 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Wed, 13 Sep 2023 18:01:54 +0800 Subject: [PATCH 5/5] 10182 --- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/ViewModels/MainViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index bb586ac3..98d217ab 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10181"; + ClientVersion = "10182"; } private User user; diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 9dedb8f3..aeeb77a6 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -92,7 +92,7 @@ namespace BBWY.Client.ViewModels { this.w2m = w2m; this.managerDepartment = new List() { "董事办", "财务部", "技术部", "总经办" }; - this.packDepartment = new List() { "打包组", "发货组", "仓储部" }; + this.packDepartment = new List() { "打包组", "发货组", "仓储部", "供应链部" }; this.httpClientFactory = httpClientFactory;