From a3d71077735537dd5ed4bcbee461520e204a754b Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Mon, 22 Jul 2024 14:42:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/comm_plan/all.go | 2 +- lib/comm_plan/init.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/comm_plan/all.go b/lib/comm_plan/all.go index 2bc6e68..c251bac 100644 --- a/lib/comm_plan/all.go +++ b/lib/comm_plan/all.go @@ -618,7 +618,7 @@ func commSubsidy(opt *PlanOpt, totalAmt, integralTotalAmt float64, lvuser *LvUse if grade[lv].UserSubsidyType == "" { grade[lv].UserSubsidyType = "up_lv" } - if opt.Mode == "lv_price_other" && grade[lv].UserSubsidyType != "up_lv" { + if (opt.Mode == "lv_price_other" || opt.Mode == "lv_commission_other") && grade[lv].UserSubsidyType != "up_lv" { pvdBool = false } if pvdBool && lvuser.Diff != 1 { diff --git a/lib/comm_plan/init.go b/lib/comm_plan/init.go index deb3c04..001b037 100644 --- a/lib/comm_plan/init.go +++ b/lib/comm_plan/init.go @@ -14,6 +14,7 @@ var Fn = map[string]func(opt *PlanOpt, totalAmt, integralTotalAmt float64, userL "lv_winery": CalcWinery, "lv_winery_adv": CalcAdv, "lv_price_other": CalcOther, + "lv_commission_other": CalcOther, "lv_ds_check": CalcDsCheck, }