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

SBF.Business/TrusteeshipBusiness.cs

@@ -125,6 +125,7 @@ namespace SBF.Business
                                EndTime = t.EndTime,
                                IsEnd = t.IsEnd,
                                StartTrusteeshipDate = t.StartTrusteeshipDate,
+                               PolicyType = t.PolicyType,
 
                                Logo = ps.Logo,
                                Price = ps.Price,
@@ -251,7 +252,8 @@ namespace SBF.Business
                 IsEnd = false,
                 StartTrusteeshipDate = DateTime.Now.Date.AddDays(1),
                 ShopId = request.ShopId,
-                SkuId = x.Sku
+                SkuId = x.Sku,
+                PolicyType = Model.Enums.PolicyType.成长期策略包
             }).ToList();
 
             var skuIdList = insertList.Select(x => x.SkuId).Distinct().ToList();

SBF.Model/Db/Trusteeship/Sbf_TrusteeshipTask.cs

@@ -108,6 +108,8 @@ namespace SBF.Model.Db
         [Column(DbType = "datetime")]
         public DateTime? StartTrusteeshipDate { get; set; }
 
+        [Column(MapType = typeof(int?))]
+        public Enums.PolicyType? PolicyType { get; set; } = Enums.PolicyType.成长期策略包;
 
         #region Product
         [Column(IsIgnore = true)]
@@ -129,7 +131,7 @@ namespace SBF.Model.Db
         [Column(IsIgnore = true)]
         public int? ProductState { get; set; }
 
-       
+
         [Column(IsIgnore = true)]
         public Enums.Stage? Stage { get; set; } = 0;
         #endregion

SBF.Model/Dto/Response/TrusteeshipTaskResponse.cs

@@ -107,5 +107,7 @@ namespace SBF.Model.Dto
         /// 业务类型/渠道 快车=2,智能投放=134217728
         /// </summary>
         public int BusinessType { get; set; }
+
+        public Enums.PolicyType? PolicyType { get; set; }
     }
 }

SBF.Model/Enums.cs

@@ -396,5 +396,13 @@
         {
             新品款 = 0, 成长款 = 1, 日销款 = 2, TOP款 = 3, 清仓款 = 4
         }
+
+        /// <summary>
+        /// 策略类型 成长期策略包 = 0, 冲击主力策略包 = 1, 稳定期策略包 = 2, 主力期策略包 = 3
+        /// </summary>
+        public enum PolicyType
+        {
+            成长期策略包 = 0, 冲击主力策略包 = 1, 稳定期策略包 = 2, 主力期策略包 = 3
+        }
     }
 }