From ecad8e5126e2ca431f9464787c71e259224ee392 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Sat, 3 Dec 2022 18:32:37 +0800 Subject: [PATCH] =?UTF-8?q?add=20reverse:for=20v4.2.4=20=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/db_integral_release_interposition_user_flow.go | 2 +- svc/reward_commission.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/db/db_integral_release_interposition_user_flow.go b/db/db_integral_release_interposition_user_flow.go index c30372a..5483dfc 100644 --- a/db/db_integral_release_interposition_user_flow.go +++ b/db/db_integral_release_interposition_user_flow.go @@ -49,7 +49,7 @@ func GetIntegralReleaseInterpositionUserFlowCount(Db *xorm.Engine) int { } func GetIntegralReleaseInterpositionUserFlowSum(sess *xorm.Session, uid int, coinId int, ordId string) float64 { var IntegralReleaseInterpositionUserFlow model.IntegralReleaseInterpositionUserFlow - count, err := sess.Where("uid=? and coin_id=? and ord_id=? and kind=?", uid, coinId, ordId, 0).Sum(&IntegralReleaseInterpositionUserFlow, "amount") + count, err := sess.Where("uid=? and coin_id=? and ord_id=? and kind=?", uid, coinId, ordId, 2).Sum(&IntegralReleaseInterpositionUserFlow, "amount") if err != nil { return 0 } diff --git a/svc/reward_commission.go b/svc/reward_commission.go index 86d272c..c1745ba 100644 --- a/svc/reward_commission.go +++ b/svc/reward_commission.go @@ -76,7 +76,8 @@ func GetRewardCommission(engine *xorm.Engine, rmd *md.CommissionParam, isShare b if zhios_order_relate_utils.InArr(cfg.Mode, []string{"lv_price", "lv_winery", "extend_price", "niubei_amount"}) && zhios_order_relate_utils.StrToFloat64(rmd.OldPrice) > 0 { //价格为基数 comf = zhios_order_relate_utils.StrToFloat64(rmd.OldPrice) } - if cfg.Mode == "public_platoon" { //公排 + if cfg.Mode == "public_platoon" { + //公排 //佣金扣除抽成后 fee, pvdFee, sysFee := CommFee(comf, cfg, "commission", rmd.IsGoods) ////积分扣除抽成后