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

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -513,14 +513,18 @@ namespace BBWY.Server.Business
 
             }
 
-            if (!string.IsNullOrEmpty(dbPromotionTask.CustomMotherSku))
-                CheckRepeatSkuInRuningTask(runingTaskList, dbPromotionTask.CustomMotherSku);
+            if (request.IsDebug == null || request.IsDebug == false)
+            {
+                if (!string.IsNullOrEmpty(dbPromotionTask.CustomMotherSku))
+                    CheckRepeatSkuInRuningTask(runingTaskList, dbPromotionTask.CustomMotherSku);
 
-            if (!string.IsNullOrEmpty(motherTemplateSku))
-                CheckRepeatSkuInRuningTask(runingTaskList, motherTemplateSku);
+                if (!string.IsNullOrEmpty(motherTemplateSku))
+                    CheckRepeatSkuInRuningTask(runingTaskList, motherTemplateSku);
+
+                if (!string.IsNullOrEmpty(dbPromotionTask.MainProductSku))
+                    CheckRepeatSkuInRuningTask(runingTaskList, dbPromotionTask.MainProductSku);
+            }
 
-            if (!string.IsNullOrEmpty(dbPromotionTask.MainProductSku))
-                CheckRepeatSkuInRuningTask(runingTaskList, dbPromotionTask.MainProductSku);
 
 
             var host = GetPlatformRelayAPIHost(Enums.Platform.京东);
@@ -761,7 +765,7 @@ namespace BBWY.Server.Business
             });
         }
 
-      
+
 
         /// <summary>
         /// 停止任务

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -967,11 +967,11 @@ namespace BBWY.Server.Business
                         var response = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
                         if (response.Json == null)
                             response.Json = JObject.Parse(response.Body);
-                        var colorProperty = response.Json["jingdong_category_read_findAttrsByCategoryIdUnlimitCate_responce"]["findattrsbycategoryidunlimitcate_result"].FirstOrDefault(j => j.Value<string>("name") == "颜色");
+                        var colorProperty = response.Json["jingdong_category_read_findAttrsByCategoryIdUnlimitCate_responce"]["findattrsbycategoryidunlimitcate_result"].FirstOrDefault(j => j["attrValueList"] != null && j["attrValueList"].Count() > 0);
                         if (colorProperty == null)
                         {
                             RollBackWhenStartPromotionError(request.AppKey, request.AppSecret, request.AppToken, giftSkuIdList, request.MainProductSpu, request.FullTitle, brandName, haveGiftTemplateSku);
-                            throw new BusinessException("获取销售属性-缺少颜色属性");
+                            throw new BusinessException("缺少销售属性");
                         }
                         colorSaleAttrs = colorProperty["attrValueList"].ToList();
                     }
@@ -1055,6 +1055,10 @@ namespace BBWY.Server.Business
                         var req = new SkuWriteUpdateSkusRequest();
                         req.wareId = wareId;
                         req.skus = skusParamList;
+
+                        //输出日志
+                        nLogManager.Default().Info($"上架赠品请求参数,任务Id{request.Id},{JsonConvert.SerializeObject(req)}");
+
                         var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
 
                         if (res.Json == null)
@@ -1521,7 +1525,7 @@ namespace BBWY.Server.Business
                     errormsg = $"{errormsg}\r\n请联系京东物流负责人,开通对应事业部ISV的授权操作";
                 throw new BusinessException(errormsg);
             }
-                
+
             return res.Json["jingdong_eclp_po_queryPoOrder_responce"]["queryPoModelList"].Children().Select(x => new JDInStoreOrderDetail()
             {
                 deptNo = x.Value<string>("deptNo"),

BBWY.Server.Model/Dto/Request/PromotionTask/StartPromotionTaskRequest.cs

@@ -8,6 +8,8 @@ namespace BBWY.Server.Model.Dto
     public class StartPromotionTaskRequest : PlatformRequest
     {
         public long Id { get; set; }
+
+        public bool? IsDebug { get; set; }
     }
 
     public class StartPromotionTaskRequest2 : PlatformRequest