删除接口

BBWY.JDSDK/Request/QueryNewProductPriceRequest.cs

@@ -6,41 +6,42 @@ namespace Jd.Api.Request
 {
     public class QueryNewProductPriceRequest : JdRequestBase<QueryNewProductPriceResponse>
     {
-                                                                                                                   public  		string
+        public string
-              bizToken
+bizToken
- {get; set;}
+        { get; set; }
-                                                          
+
-                                                          public  		Nullable<long>
+        public Nullable<long>
-              shopId
+shopId
- {get; set;}
+        { get; set; }
-                                                          
+
-                                                          public  		Nullable<long>
+        public Nullable<long>
-              projectId
+projectId
- {get; set;}
+        { get; set; }
-                                                          
+
-                                                                                                                                                                                                                                                                                                                                                           		public  		string
+        public string
-  skuidList {get; set; }
+skuidList
-                                                                                                                                                                                                public  		string
+        { get; set; }
-              source
+        public string
- {get; set;}
+source
-                                                          
+        { get; set; }
-            public override string ApiName
+
-            {
+        public override string ApiName
-                get{return "jingdong.queryNewProductPrice";}
+        {
-            }
+            get { return "jingdong.queryNewProductPrice"; }
-            protected override void PrepareParam(IDictionary<String, Object> parameters)
+        }
-            {
+        protected override void PrepareParam(IDictionary<String, Object> parameters)
-                                                                                                                                                parameters.Add("bizToken", this.            bizToken
+        {
+            parameters.Add("bizToken", this.bizToken
 );
-                                                                                                        parameters.Add("shopId", this.            shopId
+            parameters.Add("shopId", this.shopId
 );
-                                                                                                        parameters.Add("projectId", this.            projectId
+            parameters.Add("projectId", this.projectId
 );
-                                                                                                                                                parameters.Add("skuidList", this.            skuidList
+            parameters.Add("skuidList", this.skuidList
 );
-                                                                                                                                parameters.Add("source", this.            source
+            parameters.Add("source", this.source
 );
-                                                    }
+        }
     }
 }
 
@@ -48,6 +49,6 @@ namespace Jd.Api.Request
 
 
 
-        
+
- 
+
 

BBWY.JDSDK/Request/QueryOrderInfoByLocCodeRequest.cs

@@ -6,19 +6,19 @@ namespace Jd.Api.Request
 {
     public class QueryOrderInfoByLocCodeRequest : JdRequestBase<QueryOrderInfoByLocCodeResponse>
     {
-                                                                                                                   public  		string
+        public string
-              couponCode
+couponCode
- {get; set;}
+        { get; set; }
-                                                          
+
-            public override string ApiName
+        public override string ApiName
-            {
+        {
-                get{return "jingdong.queryOrderInfoByLocCode";}
+            get { return "jingdong.queryOrderInfoByLocCode"; }
-            }
+        }
-            protected override void PrepareParam(IDictionary<String, Object> parameters)
+        protected override void PrepareParam(IDictionary<String, Object> parameters)
-            {
+        {
-                                                                                                                                                parameters.Add("couponCode", this.            couponCode
+            parameters.Add("couponCode", this.couponCode
 );
-                                                    }
+        }
     }
 }
 
@@ -26,6 +26,6 @@ namespace Jd.Api.Request
 
 
 
-        
+
- 
+
 

BBWY.JDSDK/Request/QueryProdInfoRequest.cs

@@ -6,47 +6,48 @@ namespace Jd.Api.Request
 {
     public class QueryProdInfoRequest : JdRequestBase<QueryProdInfoResponse>
     {
-                                                                                                                                              public  		Nullable<long>
+        public Nullable<long>
-              shopId
+shopId
- {get; set;}
+        { get; set; }
-                                                          
+
-                                                          public  		Nullable<long>
+        public Nullable<long>
-              projectId
+projectId
- {get; set;}
+        { get; set; }
-                                                          
+
-                                                                                                                                                                                                                                                                                                                                                           		public  		string
+        public string
-  skuList {get; set; }
+skuList
-                                                                                                                                                                                                public  		string
+        { get; set; }
-              isProduct
+        public string
- {get; set;}
+isProduct
-                                                          
+        { get; set; }
-                                                                                           public  		string
+
-              bizToken
+        public string
- {get; set;}
+bizToken
-                                                          
+        { get; set; }
-                                                          public  		string
+
-              source
+        public string
- {get; set;}
+source
-                                                          
+        { get; set; }
-                                             public override string ApiName
+
-            {
+        public override string ApiName
-                get{return "jingdong.queryProdInfo";}
+        {
-            }
+            get { return "jingdong.queryProdInfo"; }
-            protected override void PrepareParam(IDictionary<String, Object> parameters)
+        }
-            {
+        protected override void PrepareParam(IDictionary<String, Object> parameters)
-                                                                                                                                        parameters.Add("shopId", this.            shopId
+        {
+            parameters.Add("shopId", this.shopId
 );
-                                                                                                        parameters.Add("projectId", this.            projectId
+            parameters.Add("projectId", this.projectId
 );
-                                                                                                                                                parameters.Add("skuList", this.            skuList
+            parameters.Add("skuList", this.skuList
 );
-                                                                                                                                parameters.Add("isProduct", this.            isProduct
+            parameters.Add("isProduct", this.isProduct
 );
-                                                                                                                                                        parameters.Add("bizToken", this.            bizToken
+            parameters.Add("bizToken", this.bizToken
 );
-                                                                                                        parameters.Add("source", this.            source
+            parameters.Add("source", this.source
 );
-                                                                            }
+        }
     }
 }
 
@@ -54,6 +55,6 @@ namespace Jd.Api.Request
 
 
 
-        
+
- 
+
 

BBWY.JDSDK/Request/SellerPromotionDeleteSkuInPromoRequest.cs

@@ -0,0 +1,24 @@
+using Jd.Api.Response;
+using System.Collections.Generic;
+
+namespace Jd.Api.Request
+{
+    public class SellerPromotionDeleteSkuInPromoRequest : JdRequestBase<SellerPromotionDeleteSkuInPromoResponse>
+    {
+        public long promoId { get; set; }
+
+        public string skuId { get; set; }
+
+        public SellerPromotionDeleteSkuInPromoRequest()
+        {
+        }
+
+        public override string ApiName => "jingdong.seller.promotion.deleteSkuInPromo";
+
+        protected override void PrepareParam(IDictionary<string, object> paramters)
+        {
+            paramters.Add("promoId", promoId);
+            paramters.Add("skuId", skuId);
+        }
+    }
+}

BBWY.JDSDK/Response/PurchaseOrderGetResponse.cs

@@ -2,15 +2,16 @@ using System;
 using System.Xml.Serialization;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-			using Jd.Api.Domain;
+using Jd.Api.Domain;
-			namespace Jd.Api.Response
+namespace Jd.Api.Response
 {
 
-public class PurchaseOrderGetResponse:JdResponse{
+    public class PurchaseOrderGetResponse : JdResponse
-      [JsonProperty("result")]
+    {
-public 				GxResponse
+        [JsonProperty("result")]
+        public GxResponse
 
-             result
+               result
- { get; set; }
+        { get; set; }
-	}
+    }
 }

BBWY.JDSDK/Response/SellerPromotionDeleteSkuInPromoResponse.cs

@@ -0,0 +1,8 @@
+using Jd.Api;
+
+namespace Jd.Api.Response
+{
+    public class SellerPromotionDeleteSkuInPromoResponse: JdResponse
+    {
+    }
+}

BBWY.Server.API/Controllers/EvaluationAssistantController.cs

@@ -97,5 +97,15 @@ namespace BBWY.Server.API.Controllers
         {
             evaluationAssistantBusiness.DeletePromotionTaskAndJDTask(request);
         }
+
+        /// <summary>
+        /// 删除任务同时删除京东活动中的奶妈SKU
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpDelete]
+        public void DeletePromotionTaskAndMotherSku([FromBody] DeletePromotionTaskRequest request)
+        {
+            evaluationAssistantBusiness.DeletePromotionTaskAndMotherSku(request);
+        }
     }
 }

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -227,8 +227,7 @@ namespace BBWY.Server.Business
             {
                 foreach (var sku in skuIdList)
                 {
-                    if ((!string.IsNullOrEmpty(pt.CustomMotherSku) && pt.CustomMotherSku.Contains(sku)) ||
+                    if (!string.IsNullOrEmpty(pt.CustomMotherSku) && pt.CustomMotherSku.Contains(sku))
-                        (!string.IsNullOrEmpty(pt.MotherTemplateSku) && pt.MotherTemplateSku.Contains(sku)))
                     {
                         throw new BusinessException($"sku[{sku}]已存在于任务[{pt.ActivityName}]中,请删除该sku或等待任务结束");
                     }
@@ -262,9 +261,9 @@ namespace BBWY.Server.Business
                 giftTemplateSku = giftTemplate.GiftSkus;
             }
 
-            //此处预留更改，等奶妈模板完善以后改为关联查询
             var runingTaskList = fsql.Select<PromotionTask>().Where(pt => pt.ShopId == dbPromotionTask.ShopId && pt.Status == Enums.PromitionTaskStatus.进行中).ToList();
 
+
             if (dbPromotionTask.MotherTemplateId != null && dbPromotionTask.MotherTemplateId != 0)
             {
 
@@ -352,9 +351,34 @@ namespace BBWY.Server.Business
             var dbPromotionTask = fsql.Select<PromotionTask>(request.TaskId).ToOne();
             if (dbPromotionTask.Status != Enums.PromitionTaskStatus.等待)
             {
+                List<string> motherSkuIdList = new List<string>();
+                if (dbPromotionTask.MotherTemplateId != null)
+                {
 
-            }
+                }
+
+                if (!string.IsNullOrEmpty(dbPromotionTask.CustomMotherSku))
+                    motherSkuIdList.AddRange(dbPromotionTask.CustomMotherSku.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries));
 
+                var httpResult = restApiService.SendRequest(GetPlatformRelayAPIHost(Enums.Platform.京东),
+                                                          "api/platformsdk/DeleteJDPromotionTaskSku",
+                                                          new DeleteJDPromotionTaskSkuRequest()
+                                                          {
+                                                              AppKey = request.AppKey,
+                                                              AppSecret = request.AppSecret,
+                                                              AppToken = request.AppToken,
+                                                              Platform = Enums.Platform.京东,
+                                                              PromotionId = dbPromotionTask.PromotionId.Value,
+                                                              SkuId = string.Join(",", motherSkuIdList)
+                                                          },
+                                                          GetYunDingRequestHeader(),
+                                                          HttpMethod.Post);
+                if (httpResult.StatusCode != System.Net.HttpStatusCode.OK)
+                    throw new BusinessException(httpResult.Content);
+                var response = JsonConvert.DeserializeObject<ApiResponse>(httpResult.Content);
+                if (!response.Success)
+                    throw new BusinessException(response.Msg);
+            }
             fsql.Delete<PromotionTask>(request.TaskId).ExecuteAffrows();
         }
         #endregion

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -1128,5 +1128,18 @@ namespace BBWY.Server.Business
             if (res.IsError)
                 throw new BusinessException($"删除JD活动失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
         }
+
+        public override void DeleteJDPromotionTaskSku(DeleteJDPromotionTaskSkuRequest request)
+        {
+            var jdClient = GetJdClient(request.AppKey, request.AppSecret);
+
+            var req = new SellerPromotionDeleteSkuInPromoRequest();
+            req.promoId = request.PromotionId;
+            req.skuId = request.SkuId;
+
+            var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
+            if (res.IsError)
+                throw new BusinessException($"删除JD活动sku失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
+        }
     }
 }

BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs

@@ -167,5 +167,10 @@ namespace BBWY.Server.Business
         {
             throw new NotImplementedException();
         }
+
+        public virtual void DeleteJDPromotionTaskSku(DeleteJDPromotionTaskSkuRequest request)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs

@@ -63,12 +63,6 @@ namespace BBWY.Server.Model.Db
 
         public long? MotherTemplateId { get; set; }
 
-        /// <summary>
-        /// 奶妈模板关联的Sku
-        /// </summary>
-        [Column(IsIgnore = true)]
-        public string MotherTemplateSku { get; set; }
-
         /// <summary>
         /// 促销活动Id
         /// </summary>

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

@@ -9,4 +9,12 @@
     {
         public long PromotionId { get; set; }
     }
+
+    public class DeleteJDPromotionTaskSkuRequest : DeleteJDPromotionTaskRequest
+    {
+        /// <summary>
+        /// 多个sku之间逗号间隔
+        /// </summary>
+        public string SkuId { get; set; }
+    }
 }

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

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace BBWY.Server.Model.Dto
 {
-    public class StartPromotionTaskRequest
+    public class StartPromotionTaskRequest: PlatformRequest
     {
         public long Id { get; set; }
     }

JD.API/Controllers/PlatformSDKController.cs

@@ -297,5 +297,15 @@ namespace JD.API.API.Controllers
         {
             platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).DeleteJDPromotionTask(request);
         }
+
+        /// <summary>
+        /// 删除京东活动SKU
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void DeleteJDPromotionTaskSku([FromBody] DeleteJDPromotionTaskSkuRequest request)
+        {
+            platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).DeleteJDPromotionTaskSku(request);
+        }
     }
 }