fix: 补齐渠道全量合计筛选导出及有效端目标遗漏
This commit is contained in:
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
type AnalyticsUsecase interface {
|
||||
List(context.Context, business.AnalyticsKind, business.AnalyticsFilter, int, int) (*business.AnalyticsPage, error)
|
||||
ListAll(context.Context, business.AnalyticsKind, business.AnalyticsFilter) (*business.AnalyticsPage, error)
|
||||
}
|
||||
type AnalyticsService struct{ uc AnalyticsUsecase }
|
||||
|
||||
@@ -24,22 +25,21 @@ func analyticsRequest(req *dto.AnalyticsQuery) (business.AnalyticsFilter, error)
|
||||
if err != nil {
|
||||
return business.AnalyticsFilter{}, err
|
||||
}
|
||||
f := business.AnalyticsFilter{Sources: sources, GameNames: splitQueryValues(req.GameNames), PromoteName: strings.TrimSpace(req.PromoteName), PromoteType: req.PromoteType, SortField: strings.TrimSpace(req.SortField), Ascending: strings.EqualFold(strings.TrimSpace(req.SortOrder), "asc")}
|
||||
f := business.AnalyticsFilter{Sources: sources, GameNames: splitQueryValues(req.GameNames), PromoteName: strings.TrimSpace(req.PromoteName), PromoteType: req.PromoteType, HasRegister: req.HasRegister, HasPay: req.HasPay, SortField: strings.TrimSpace(req.SortField), Ascending: strings.EqualFold(strings.TrimSpace(req.SortOrder), "asc")}
|
||||
begin, end := strings.TrimSpace(req.BeginTime), strings.TrimSpace(req.EndTime)
|
||||
if (begin == "") != (end == "") {
|
||||
return f, business.ErrAnalyticsDate
|
||||
}
|
||||
if begin != "" && end != "" {
|
||||
location := time.FixedZone("Asia/Shanghai", 8*3600)
|
||||
location := time.FixedZone("Asia/Shanghai", 8*3600)
|
||||
if begin != "" {
|
||||
b, err := time.ParseInLocation("2006-01-02", begin, location)
|
||||
if err != nil {
|
||||
return f, business.ErrAnalyticsDate
|
||||
}
|
||||
f.StartDate = &b
|
||||
}
|
||||
if end != "" {
|
||||
e, err := time.ParseInLocation("2006-01-02", end, location)
|
||||
if err != nil || e.Before(b) {
|
||||
if err != nil || f.StartDate != nil && e.Before(*f.StartDate) {
|
||||
return f, business.ErrAnalyticsDate
|
||||
}
|
||||
f.StartDate = &b
|
||||
f.EndDate = &e
|
||||
}
|
||||
return f, nil
|
||||
|
||||
Reference in New Issue
Block a user