huangjiajun
1 year ago
1 changed files with 2 additions and 2 deletions
Unified View
Diff Options
+ 2
- 2
rule/consume_integral_settlement.go
View File
| @@ -166,7 +166,7 @@ func calcNowEverydayConsumeIntegral(subsidyBase *model.SubsidyBase, hasConsumeTo | |||||
| if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 | if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 | ||||
| subsidyBase.FloatSubsidyBili = 0 | subsidyBase.FloatSubsidyBili = 0 | ||||
| } | } | ||||
| floatSubsidyBili := decimal.NewFromInt(int64(subsidyBase.FloatSubsidyBili) / 10000) | |||||
| floatSubsidyBili := decimal.NewFromFloat(float64(subsidyBase.FloatSubsidyBili) / 10000) | |||||
| consumeTotal := decimal.NewFromInt(hasConsumeTotal) | consumeTotal := decimal.NewFromInt(hasConsumeTotal) | ||||
| value, _ = consumptionMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() | value, _ = consumptionMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() | ||||
| return | return | ||||
| @@ -180,7 +180,7 @@ func calcNowEverydayExperienceIntegral(subsidyBase *model.SubsidyBase, hasExperi | |||||
| if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 | if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 | ||||
| subsidyBase.FloatSubsidyBili = 0 | subsidyBase.FloatSubsidyBili = 0 | ||||
| } | } | ||||
| floatSubsidyBili := decimal.NewFromInt(int64(subsidyBase.FloatSubsidyBili) / 10000) | |||||
| floatSubsidyBili := decimal.NewFromFloat(float64(subsidyBase.FloatSubsidyBili) / 10000) | |||||
| consumeTotal := decimal.NewFromInt(hasExperienceTotal) | consumeTotal := decimal.NewFromInt(hasExperienceTotal) | ||||
| value, _ = experienceMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() | value, _ = experienceMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() | ||||
| return | return | ||||