From b5a2fc5724720c56ef9e95c28bb8b99a2d0b99bf Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Fri, 3 Mar 2023 16:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EOuterId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs          | 2 ++
 .../EvaluationAssistant/EvaluationAssistantBusiness.cs   | 9 +++++++--
 BBWY.Server.Business/PlatformSDK/JDBusiness.cs           | 1 +
 .../Db/EvaluationAssistant/PromotionTask.cs              | 5 +++++
 .../PromotionTask/AddOrEditPromotionTaskRequest.cs       | 5 +++++
 .../Request/PromotionTask/StartPromotionTaskRequest.cs   | 2 ++
 .../Dto/Response/PromotionTask/PromotionTaskResponse.cs  | 5 +++++
 7 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs b/BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs
index 3587f82f..39107390 100644
--- a/BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs
+++ b/BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs
@@ -38,6 +38,8 @@ namespace Jd.Api.Request
 
         public string barCode { get; set; }
 
+        public string outerId { get; set; }
+
         public List<SkuWriteUpdateSkusItemSaleAttrs> multiCateProps { get; set; }
     }
 
diff --git a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
index 4b105c15..67f59010 100644
--- a/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
+++ b/BBWY.Server.Business/EvaluationAssistant/EvaluationAssistantBusiness.cs
@@ -168,6 +168,9 @@ namespace BBWY.Server.Business
             if (request.TaskCount == 0)
                 throw new BusinessException("任务量不能为0");
 
+            if (request.GiftTemplateId != 0 && string.IsNullOrEmpty(request.OuterId))
+                throw new BusinessException("使用赠品模板时必须填写外部Id");
+
             request.FullTitle = request.FullTitle.Trim();
             request.ActivityName = request.ActivityName.Trim();
             request.MainProductSpu = request.MainProductSpu.Trim();
@@ -219,7 +222,8 @@ namespace BBWY.Server.Business
                     SpuLogo = spuResponse.Data.Items[0].Logo,
                     SpuPublishTime = spuResponse.Data.Items[0].CreateTime,
                     TaskCount = request.TaskCount,
-                    CustomMotherSku = request.CustomMotherSku
+                    CustomMotherSku = request.CustomMotherSku,
+                    OuterId = request.OuterId
                 };
                 fsql.Insert(promotionTask).ExecuteAffrows();
             }
@@ -594,7 +598,8 @@ namespace BBWY.Server.Business
                 MainProductBarCode = barCode,
                 MainProductCategoryId = categoryId,
                 MainProductMultiCateProps = multiCateProps,
-                MainProductSkuInStore = mainProductSkuInStore
+                MainProductSkuInStore = mainProductSkuInStore,
+                OuterId = dbPromotionTask.OuterId
 
             }, GetYunDingRequestHeader(), HttpMethod.Post);
 
diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index 98e238f5..b1e85629 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -967,6 +967,7 @@ namespace BBWY.Server.Business
                             jdPrice = giftSku.Price ?? 0,
                             stockNum = 9999,
                             barCode = request.MainProductBarCode,
+                            outerId = $"{request.OuterId}{(i + 1).ToString().PadLeft(3, '0')}",
                             saleAttrs = new List<SkuWriteUpdateSkusItemSaleAttrs>()
                         {
                             new SkuWriteUpdateSkusItemSaleAttrs()
diff --git a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
index dd97ea20..317a7571 100644
--- a/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
+++ b/BBWY.Server.Model/Db/EvaluationAssistant/PromotionTask.cs
@@ -140,6 +140,11 @@ namespace BBWY.Server.Model.Db
         /// 错误信息
         /// </summary>
         public string ErrorMsg { get; set; }
+
+        /// <summary>
+        /// 外部Id
+        /// </summary>
+        public string OuterId { get; set; }
     }
 
 }
diff --git a/BBWY.Server.Model/Dto/Request/PromotionTask/AddOrEditPromotionTaskRequest.cs b/BBWY.Server.Model/Dto/Request/PromotionTask/AddOrEditPromotionTaskRequest.cs
index 07556784..864591e3 100644
--- a/BBWY.Server.Model/Dto/Request/PromotionTask/AddOrEditPromotionTaskRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PromotionTask/AddOrEditPromotionTaskRequest.cs
@@ -49,5 +49,10 @@
         /// 任务数量
         /// </summary>
         public int TaskCount { get; set; }
+
+        /// <summary>
+        /// 外部Id
+        /// </summary>
+        public string OuterId { get; set; }
     }
 }
diff --git a/BBWY.Server.Model/Dto/Request/PromotionTask/StartPromotionTaskRequest.cs b/BBWY.Server.Model/Dto/Request/PromotionTask/StartPromotionTaskRequest.cs
index da8190bf..9a8a3b5b 100644
--- a/BBWY.Server.Model/Dto/Request/PromotionTask/StartPromotionTaskRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PromotionTask/StartPromotionTaskRequest.cs
@@ -72,6 +72,8 @@ namespace BBWY.Server.Model.Dto
         /// 主商品Sku是否入仓
         /// </summary>
         public bool MainProductSkuInStore { get; set; }
+
+        public string OuterId { get; set; }
     }
 
     public class StartPromotionTaskDelayRequest : PlatformRequest
diff --git a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
index 5dcaa7c4..514be04c 100644
--- a/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PromotionTask/PromotionTaskResponse.cs
@@ -128,6 +128,11 @@ namespace BBWY.Server.Model.Dto
         /// 错误信息
         /// </summary>
         public string ErrorMsg { get; set; }
+
+        /// <summary>
+        /// 外部Id
+        /// </summary>
+        public string OuterId { get; set; }
     }
 
     public class PromotionTaskResponse