diff --git a/rule/consume_integral_settlement.go b/rule/consume_integral_settlement.go index c85694a..9e82f4c 100644 --- a/rule/consume_integral_settlement.go +++ b/rule/consume_integral_settlement.go @@ -166,7 +166,7 @@ func calcNowEverydayConsumeIntegral(subsidyBase *model.SubsidyBase, hasConsumeTo if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 subsidyBase.FloatSubsidyBili = 0 } - floatSubsidyBili := decimal.NewFromInt(int64(subsidyBase.FloatSubsidyBili) / 10000) + floatSubsidyBili := decimal.NewFromFloat(float64(subsidyBase.FloatSubsidyBili) / 10000) consumeTotal := decimal.NewFromInt(hasConsumeTotal) value, _ = consumptionMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() return @@ -180,7 +180,7 @@ func calcNowEverydayExperienceIntegral(subsidyBase *model.SubsidyBase, hasExperi if subsidyBase.FloatSubsidyOpen == 0 { //没有浮动补贴情况 subsidyBase.FloatSubsidyBili = 0 } - floatSubsidyBili := decimal.NewFromInt(int64(subsidyBase.FloatSubsidyBili) / 10000) + floatSubsidyBili := decimal.NewFromFloat(float64(subsidyBase.FloatSubsidyBili) / 10000) consumeTotal := decimal.NewFromInt(hasExperienceTotal) value, _ = experienceMoney.Mul(floatSubsidyBili).Div(consumeTotal).Add(baseSubsidyMoney).Float64() return