Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

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;

BBWY.Client/GlobalContext.cs

@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10181";
+            ClientVersion = "10182";
         }
 
         private User user;

BBWY.Client/ViewModels/MainViewModel.cs

@@ -92,7 +92,7 @@ namespace BBWY.Client.ViewModels
         {
             this.w2m = w2m;
             this.managerDepartment = new List<string>() { "董事办", "财务部", "技术部", "总经办" };
-            this.packDepartment = new List<string>() { "打包组", "发货组", "仓储部" };
+            this.packDepartment = new List<string>() { "打包组", "发货组", "仓储部", "供应链部" };
 
 
             this.httpClientFactory = httpClientFactory;
@@ -310,16 +310,16 @@ namespace BBWY.Client.ViewModels
 
                 CreateMenu();
 
+
+
+
+
+
                 IList<Department> departmentList = null;
-                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<IList<Department>>();
+                var response1 = shopService.GetDepartmentList();
+                if (!response1.Success)
+                    throw new Exception(response1.Msg);
+                departmentList = response1.Data.Map<IList<Department>>();
 
                 //if (GlobalContext.User.TeamName == "刷单组")
                 //{
@@ -327,6 +327,15 @@ namespace BBWY.Client.ViewModels
                 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;
+                   
                     //}
                 }
                 else
@@ -337,7 +346,6 @@ namespace BBWY.Client.ViewModels
                     departmentList = response.Data;
                     if (departmentList.Count == 0)
                         throw new Exception("缺少有效的部门数据");
-
                     var shopIds = new List<string>();
                     foreach (var d in departmentList)
                     {

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<SellerDeliverySendPromiseTemplateJsfServiceQuerySendTemplateByCategoryResponse>
+    {
+        public override string ApiName => "jingdong.seller.delivery.SendPromiseTemplateJsfService.querySendTemplateByCategory";
+
+        public int categoryId { get; set; }
+
+        public bool dzSku { get; set; }
+
+        protected override void PrepareParam(IDictionary<string, object> paramters)
+        {
+            paramters.Add("categoryId", this.categoryId);
+            paramters.Add("dzSku", this.dzSku);
+        }
+    }
+}

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
+    {
+    }
+}

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<long, string>((id, errorMsg) =>
             {

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;
@@ -967,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)
                         {
@@ -1071,8 +1075,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<int>("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)
                                 {
@@ -1264,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);

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -1047,8 +1047,12 @@ namespace BBWY.Server.Business
             var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
             var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request);
 
-            if (payOrderResponse.Success)//取消成功
+            if (!payOrderResponse.Success)//取消成功
             {
+                if (!payOrderResponse.Msg.Contains("订单已删除"))
+                    throw new BusinessException(payOrderResponse.Msg);
+            }
+
             //var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
             fsql.Update<PurchaseOrderV2>(request.OrderId)
                 .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消)
@@ -1067,8 +1071,6 @@ namespace BBWY.Server.Business
             {
                 nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
             }
-
-            }
         }
 
         public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request)