开始任务接口

BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs

@@ -215,6 +215,27 @@ namespace BBWY.Server.Business
             }
         }
 
+        /// <summary>
+        /// 检查活动重复sku
+        /// </summary>
+        /// <param name="runingTaskList"></param>
+        /// <param name="skuIds"></param>
+        private void CheckRepeatSkuInRuningTask(IList<PromotionTask> runingTaskList, string skuIds)
+        {
+            var skuIdList = skuIds.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var pt in runingTaskList)
+            {
+                foreach (var sku in skuIdList)
+                {
+                    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或等待任务结束");
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// 开始活动任务
         /// </summary>
@@ -241,11 +262,20 @@ 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)
             {
 
             }
 
+            if (!string.IsNullOrEmpty(dbPromotionTask.CustomMotherSku))
+                CheckRepeatSkuInRuningTask(runingTaskList, dbPromotionTask.CustomMotherSku);
+
+            if (!string.IsNullOrEmpty(motherTemplateSku))
+                CheckRepeatSkuInRuningTask(runingTaskList, motherTemplateSku);
+
             var host = GetPlatformRelayAPIHost(Enums.Platform.京东);
             var httpApiResult = restApiService.SendRequest(host, "api/PlatformSDK/StartJDPromotionTask", new StartPromotionTaskRequest2()
             {

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

@@ -63,6 +63,12 @@ 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/Response/PromotionTask/PromotionTaskResponse.cs

@@ -1,11 +1,113 @@
 using BBWY.Server.Model.Db;
+using System;
 using System.Collections.Generic;
 
 namespace BBWY.Server.Model.Dto
 {
-    public class PromotionTaskItemResponse: PromotionTask
+    public class PromotionTaskItemResponse
     {
+        public long Id { get; set; }
 
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityName { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 完整标题
+        /// </summary>
+
+        public string FullTitle { get; set; }
+
+        /// <summary>
+        /// 赠品模板Id 可空
+        /// </summary>
+
+        public long? GiftTemplateId { get; set; }
+
+        /// <summary>
+        /// 主商品的赠品sku，逗号间隔，可空 
+        /// </summary>
+
+        public string MainProductGiftSku { get; set; }
+
+        /// <summary>
+        /// 主商品sku，逗号间隔，可空
+        /// </summary>
+
+        public string MainProductSku { get; set; }
+
+        /// <summary>
+        /// 主商品spu
+        /// </summary>
+        public string MainProductSpu { get; set; }
+
+        /// <summary>
+        /// 奶妈模板Id 可空
+        /// </summary>
+
+        public long? MotherTemplateId { get; set; }
+
+        /// <summary>
+        /// 奶妈模板关联的Sku
+        /// </summary>
+        public string MotherTemplateSku { get; set; }
+
+        /// <summary>
+        /// 促销活动Id
+        /// </summary>
+
+        public long? PromotionId { get; set; }
+
+
+        public long? ShopId { get; set; }
+
+        /// <summary>
+        /// 精简标题
+        /// </summary>
+        public string SimpleTitle { get; set; }
+
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public Enums.PromitionTaskStatus? Status { get; set; }
+
+        public bool IsEnabled { get; set; } = true;
+
+        public int Sort { get; set; }
+
+        public DateTime? UpdateSortTime { get; set; }
+
+        public string SpuLogo { get; set; }
+
+        public DateTime? SpuPublishTime { get; set; }
+
+        /// <summary>
+        /// 任务开始时间
+        /// </summary>
+        public DateTime? StartTime { get; set; }
+
+        /// <summary>
+        /// 任务结束时间
+        /// </summary>
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 自定义奶妈sku
+        /// </summary>
+        public string CustomMotherSku { get; set; }
+
+        /// <summary>
+        /// 任务数量
+        /// </summary>
+        public int TaskCount { get; set; }
+
+        /// <summary>
+        /// 已完成任务量
+        /// </summary>
+        public int CompletedTaskCount { get; set; }
     }
 
     public class PromotionTaskResponse