diff --git a/rule/consume_integral_settlement.go b/rule/consume_integral_settlement.go index 8d67eaf..da7bfb2 100644 --- a/rule/consume_integral_settlement.go +++ b/rule/consume_integral_settlement.go @@ -123,13 +123,12 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask } if hasConsumeTotal > 0 { for _, v := range subsidyWithUserForConsumeList { - if v.LeaveDay-1 < 0 { - continue + if v.LeaveDay > 0 { + consumeTotalMap[v.Uid] = consumeTotalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) + totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) + consumeTotalCountMap[v.Uid]++ + consumeValueTotal = consumeValueTotal.Add(decimal.NewFromFloat(consumeValue)) } - consumeTotalMap[v.Uid] = consumeTotalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) - totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) - consumeTotalCountMap[v.Uid]++ - consumeValueTotal = consumeValueTotal.Add(decimal.NewFromFloat(consumeValue)) err1 := DealUserConsumeIntegral(session, &v, consumeValue, mid) if err1 != nil { _ = session.Rollback() @@ -158,13 +157,12 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask return err, totalMap, storeTotalMap } for _, v := range subsidyWithUserForExperienceList { - if v.LeaveDay-1 < 0 { - continue + if v.LeaveDay > 0 { + experienceTotalCountMap[v.Uid]++ + totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) + experienceTotalMap[v.Uid] = experienceTotalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) + experienceValueTotal = experienceValueTotal.Add(decimal.NewFromFloat(experienceValue)) } - experienceTotalCountMap[v.Uid]++ - totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) - experienceTotalMap[v.Uid] = experienceTotalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) - experienceValueTotal = experienceValueTotal.Add(decimal.NewFromFloat(experienceValue)) err1 := DealUserExperienceIntegral(session, &v, experienceValue, mid) if err1 != nil { _ = session.Rollback()