diff --git a/rule/consume_integral_settlement.go b/rule/consume_integral_settlement.go index 399f2e3..8d67eaf 100644 --- a/rule/consume_integral_settlement.go +++ b/rule/consume_integral_settlement.go @@ -123,6 +123,9 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask } if hasConsumeTotal > 0 { for _, v := range subsidyWithUserForConsumeList { + if v.LeaveDay-1 < 0 { + continue + } consumeTotalMap[v.Uid] = consumeTotalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) consumeTotalCountMap[v.Uid]++ @@ -155,6 +158,9 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask return err, totalMap, storeTotalMap } for _, v := range subsidyWithUserForExperienceList { + if v.LeaveDay-1 < 0 { + continue + } experienceTotalCountMap[v.Uid]++ totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) experienceTotalMap[v.Uid] = experienceTotalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue))