Browse Source

add reverse:for v4.2.4 积分释放

tags/v4.2.4
huangjiajun 1 year ago
parent
commit
ecad8e5126
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      db/db_integral_release_interposition_user_flow.go
  2. +2
    -1
      svc/reward_commission.go

+ 1
- 1
db/db_integral_release_interposition_user_flow.go View File

@@ -49,7 +49,7 @@ func GetIntegralReleaseInterpositionUserFlowCount(Db *xorm.Engine) int {
} }
func GetIntegralReleaseInterpositionUserFlowSum(sess *xorm.Session, uid int, coinId int, ordId string) float64 { func GetIntegralReleaseInterpositionUserFlowSum(sess *xorm.Session, uid int, coinId int, ordId string) float64 {
var IntegralReleaseInterpositionUserFlow model.IntegralReleaseInterpositionUserFlow 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 { if err != nil {
return 0 return 0
} }


+ 2
- 1
svc/reward_commission.go View File

@@ -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 { //价格为基数 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) 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) fee, pvdFee, sysFee := CommFee(comf, cfg, "commission", rmd.IsGoods)
////积分扣除抽成后 ////积分扣除抽成后


Loading…
Cancel
Save