diff --git a/service/channelSer/settlement.go b/service/channelSer/settlement.go index 9b98240..0cb17e6 100644 --- a/service/channelSer/settlement.go +++ b/service/channelSer/settlement.go @@ -197,7 +197,7 @@ func ChannelSettlementCalc(ctx context.Context, req *proto.SettlementCalcReq) (* for _, parent := range ParentList { parent.CorrectValidData() for _, child := range ChildList { - if child.ParentChannel == parent.Channel && child.SumDate.Equal(parent.SumDate) { + if child.ParentChannel == parent.Channel && child.AppId == parent.AppId && child.SumDate.Equal(parent.SumDate) { channelmod.ChannelStatSummation(parent, child.CorrectValidData()) // 把子渠道的数据累加到父渠道上面 } } @@ -324,7 +324,7 @@ func SearchChannelSettlementStat2(ctx context.Context, req *proto.ChannelStatSet for _, parent := range ParentsChannelStatList { parent.CorrectValidData() for _, child := range ChildChannelStatList { - if child.ParentChannel == parent.Channel && child.SumDate.Equal(parent.SumDate) { + if child.ParentChannel == parent.Channel && child.AppId == parent.AppId && child.SumDate.Equal(parent.SumDate) { channelmod.ChannelStatSummation(parent, child) // 把子渠道的数据累加到父渠道上面 } } @@ -854,7 +854,7 @@ func AddSettlementInfo2(ctx context.Context, req *proto.SettlementInfoAdd2, accT for _, parent := range ParentList { parent.CorrectValidData() for _, child := range ChildList { - if child.ParentChannel == parent.Channel && child.SumDate.Equal(parent.SumDate) { + if child.ParentChannel == parent.Channel && child.AppId == parent.AppId && child.SumDate.Equal(parent.SumDate) { channelmod.ChannelStatSummation(parent, child) // 把子渠道的数据累加到父渠道上面 } } @@ -1138,7 +1138,7 @@ func DetailSettlementInfo(ctx context.Context, req proto.SettlementInfoDetail) ( // 把子级记录汇总到一级记录上面 for _, parent := range ParentsChannelStatList { for _, child := range ChildsChannelStatList { - if child.ParentChannel == parent.Channel && child.SumDate.Equal(parent.SumDate) { + if child.ParentChannel == parent.Channel && child.AppId == parent.AppId && child.SumDate.Equal(parent.SumDate) { channelmod.ChannelStatSummation(parent, child) // 把子渠道的数据累加到父渠道上面 } } diff --git a/service/channelSer/stat.go b/service/channelSer/stat.go index 3fa2143..d9894ab 100644 --- a/service/channelSer/stat.go +++ b/service/channelSer/stat.go @@ -159,7 +159,7 @@ func SearchChannelStat(ctx context.Context, req *proto.ChannelStatSearch) (*prot channelmod.ChannelStatSummation(&resp.TotalInfo, item) if req.WithChild != nil && *req.WithChild { for _, v := range ChannelStatList { - if item.ParentChannel == v.Channel && v.SumDate.Equal(item.SumDate) { + if item.ParentChannel == v.Channel && item.AppId == v.AppId && v.SumDate.Equal(item.SumDate) { channelmod.ChannelStatSummation(v, item) } }