diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
index 36105fea..e58a1746 100644
--- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
+++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
@@ -215,6 +215,27 @@ namespace BBWY.Server.Business
}
}
+ ///
+ /// 检查活动重复sku
+ ///
+ ///
+ ///
+ private void CheckRepeatSkuInRuningTask(IList 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或等待任务结束");
+ }
+ }
+ }
+ }
+
///
/// 开始活动任务
///
@@ -241,11 +262,20 @@ namespace BBWY.Server.Business
giftTemplateSku = giftTemplate.GiftSkus;
}
+ //此处预留更改,等奶妈模板完善以后改为关联查询
+ var runingTaskList = fsql.Select().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()
{
diff --git a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
index 2ee22255..9de9b09a 100644
--- a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
+++ b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
@@ -63,6 +63,12 @@ namespace BBWY.Server.Model.Db
public long? MotherTemplateId { get; set; }
+ ///
+ /// 奶妈模板关联的Sku
+ ///
+ [Column(IsIgnore = true)]
+ public string MotherTemplateSku { get; set; }
+
///
/// 促销活动Id
///
diff --git a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
index d2036081..7ad7fcb3 100644
--- a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
+++ b/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; }
+ ///
+ /// 活动名称
+ ///
+ public string ActivityName { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 完整标题
+ ///
+
+ public string FullTitle { get; set; }
+
+ ///
+ /// 赠品模板Id 可空
+ ///
+
+ public long? GiftTemplateId { get; set; }
+
+ ///
+ /// 主商品的赠品sku,逗号间隔,可空
+ ///
+
+ public string MainProductGiftSku { get; set; }
+
+ ///
+ /// 主商品sku,逗号间隔,可空
+ ///
+
+ public string MainProductSku { get; set; }
+
+ ///
+ /// 主商品spu
+ ///
+ public string MainProductSpu { get; set; }
+
+ ///
+ /// 奶妈模板Id 可空
+ ///
+
+ public long? MotherTemplateId { get; set; }
+
+ ///
+ /// 奶妈模板关联的Sku
+ ///
+ public string MotherTemplateSku { get; set; }
+
+ ///
+ /// 促销活动Id
+ ///
+
+ public long? PromotionId { get; set; }
+
+
+ public long? ShopId { get; set; }
+
+ ///
+ /// 精简标题
+ ///
+ public string SimpleTitle { get; set; }
+
+ ///
+ /// 任务状态
+ ///
+ 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; }
+
+ ///
+ /// 任务开始时间
+ ///
+ public DateTime? StartTime { get; set; }
+
+ ///
+ /// 任务结束时间
+ ///
+ public DateTime? EndTime { get; set; }
+
+ ///
+ /// 自定义奶妈sku
+ ///
+ public string CustomMotherSku { get; set; }
+
+ ///
+ /// 任务数量
+ ///
+ public int TaskCount { get; set; }
+
+ ///
+ /// 已完成任务量
+ ///
+ public int CompletedTaskCount { get; set; }
}
public class PromotionTaskResponse