|
@@ -123,6 +123,9 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask |
|
|
} |
|
|
} |
|
|
if hasConsumeTotal > 0 { |
|
|
if hasConsumeTotal > 0 { |
|
|
for _, v := range subsidyWithUserForConsumeList { |
|
|
for _, v := range subsidyWithUserForConsumeList { |
|
|
|
|
|
if v.LeaveDay-1 < 0 { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
consumeTotalMap[v.Uid] = consumeTotalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) |
|
|
consumeTotalMap[v.Uid] = consumeTotalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) |
|
|
totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) |
|
|
totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(consumeValue)) |
|
|
consumeTotalCountMap[v.Uid]++ |
|
|
consumeTotalCountMap[v.Uid]++ |
|
@@ -155,6 +158,9 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask |
|
|
return err, totalMap, storeTotalMap |
|
|
return err, totalMap, storeTotalMap |
|
|
} |
|
|
} |
|
|
for _, v := range subsidyWithUserForExperienceList { |
|
|
for _, v := range subsidyWithUserForExperienceList { |
|
|
|
|
|
if v.LeaveDay-1 < 0 { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
experienceTotalCountMap[v.Uid]++ |
|
|
experienceTotalCountMap[v.Uid]++ |
|
|
totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) |
|
|
totalMap[v.Uid] = totalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) |
|
|
experienceTotalMap[v.Uid] = experienceTotalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) |
|
|
experienceTotalMap[v.Uid] = experienceTotalMap[v.Uid].Add(decimal.NewFromFloat(experienceValue)) |
|
|