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

BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs

@@ -63,5 +63,9 @@ namespace Jd.Api.Request
         public int index { get; set; }
 
         public List<int?> attrValuesSeqNo { get; set; }
+
+        public List<string> expands { get; set; }
+
+        public List<string> units { get; set; }
     }
 }

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -1136,7 +1136,9 @@ namespace BBWY.Server.Business
                             var tempDataJarray = JArray.Parse(res.Json["jingdong_category_read_findSaleAttrTemplates_responce"]["categoryAttrTemplates"]["templateData"].ToString());
                             var tempDataJToken = tempDataJarray.FirstOrDefault(j => j.Value<string>("valueRules").Contains("颜色") ||
                                                                                     j.Value<string>("valueRules").Contains("款式") ||
-                                                                                    j.Value<string>("valueRules").Contains("规格"));
+                                                                                    j.Value<string>("valueRules").Contains("规格") ||
+                                                                                    j.Value<string>("valueRules").Contains("尺寸") ||
+                                                                                    j.Value<string>("valueRules").Contains("玩偶种类"));
                             if (tempDataJToken == null)
                             {
                                 //RollBackWhenStartPromotionError(request.AppKey, request.AppSecret, request.AppToken, giftSkuIdList, request.MainProductSpu, request.FullTitle, brandName, haveGiftTemplateSku);
@@ -1343,6 +1345,8 @@ namespace BBWY.Server.Business
                                 m.type = "com.jd.pop.ware.ic.api.domain.Prop";
                                 m.attrId = multiCateProp.Value<string>("attrId");
                                 m.attrValues = multiCateProp.Value<JArray>("attrValues").Select(x => x.ToString()).ToList();
+                                m.expands = multiCateProp.Value<JArray>("expands").Select(x => x.ToString()).ToList();
+                                m.units = multiCateProp.Value<JArray>("units").Select(x => x.ToString()).ToList();
                                 p.multiCateProps.Add(m);
                             }
                         }
@@ -1703,7 +1707,7 @@ namespace BBWY.Server.Business
             catch { }
             #endregion
 
-            DisableGiftSku(request.AppKey, request.AppSecret, request.AppToken, request.DeleteGiftSkuList, request.MainProductSpu, request.FullTitle, request.BrandName, true, request.IsNewProduct);
+            //DisableGiftSku(request.AppKey, request.AppSecret, request.AppToken, request.DeleteGiftSkuList, request.MainProductSpu, request.FullTitle, request.BrandName, true, request.IsNewProduct);
         }
 
         public override void DeleteJDPromotionTask(DeleteJDPromotionTaskRequest request)