diff --git a/SBF.Business/TrusteeshipBusiness.cs b/SBF.Business/TrusteeshipBusiness.cs index c5904dd..148d7de 100644 --- a/SBF.Business/TrusteeshipBusiness.cs +++ b/SBF.Business/TrusteeshipBusiness.cs @@ -90,7 +90,7 @@ namespace SBF.Business var list = fsql.Select() .InnerJoin((t, p, ps) => t.SpuId == p.Id) .InnerJoin((t, p, ps) => t.SkuId == ps.Id) - .Where((t, p, ps) => t.ShopId == request.ShopId) + .Where((t, p, ps) => t.ShopId == request.ShopId && t.BusinessType == request.BusinessType) .WhereIf(request.Stage != null, (t, p, ps) => p.Stage == request.Stage) .WhereIf(!string.IsNullOrEmpty(request.Spu), (t, p, ps) => t.SpuId == request.Spu) .WhereIf(!string.IsNullOrEmpty(request.Sku), (t, p, ps) => t.SkuId == request.Sku) diff --git a/SBF.Model/Sbf_TrusteeshipTask.cs b/SBF.Model/Db/Trusteeship/Sbf_TrusteeshipTask.cs similarity index 100% rename from SBF.Model/Sbf_TrusteeshipTask.cs rename to SBF.Model/Db/Trusteeship/Sbf_TrusteeshipTask.cs diff --git a/SBF.Model/Dto/Request/QueryTrusteeshipRequest.cs b/SBF.Model/Dto/Request/QueryTrusteeshipRequest.cs index d2d68ab..e2b2b4f 100644 --- a/SBF.Model/Dto/Request/QueryTrusteeshipRequest.cs +++ b/SBF.Model/Dto/Request/QueryTrusteeshipRequest.cs @@ -4,6 +4,11 @@ { public Enums.Stage? Stage { get; set; } + /// + /// 业务类型/渠道 快车=2,智能投放=134217728 + /// + public int BusinessType { get; set; } + public long? ShopId { get; set; } public string Spu { get; set; }