huangjiajun
8 months ago
1 changed files with 7 additions and 7 deletions
Unified View
Diff Options
-
+7 -7svc/reward_commission.go
+ 7
- 7
svc/reward_commission.go
View File
| @@ -609,14 +609,14 @@ func CommFee(fee float64, opt *comm_plan.PlanOpt, types string, rmd *md.Commissi | |||||
| regionSubFee := fee * opt.RegionSubRate | regionSubFee := fee * opt.RegionSubRate | ||||
| // 剩余可分配的佣金 | // 剩余可分配的佣金 | ||||
| total := int64(fee*1e4) - int64(pvdFee*1e4) - int64(sysFee*1e4) - int64(regionFee*1e4) - int64(regionSubFee*1e4) - int64(globalFee*1e4) - int64(selfBuyGlobalFee*1e4) - int64(pushHandFee*1e4) - int64(merchantFee*1e4) - int64(newAgentFee*1e4) | |||||
| total := int64(fee*1e6) - int64(pvdFee*1e6) - int64(sysFee*1e6) - int64(regionFee*1e6) - int64(regionSubFee*1e6) - int64(globalFee*1e6) - int64(selfBuyGlobalFee*1e6) - int64(pushHandFee*1e6) - int64(merchantFee*1e6) - int64(newAgentFee*1e6) | |||||
| for _, v := range opt.RateList { | for _, v := range opt.RateList { | ||||
| total -= int64(fee * (v / 100) * 1e4) | |||||
| total -= int64(fee * (v / 100) * 1e6) | |||||
| } | } | ||||
| if zhios_order_relate_utils.StrToFloat64(rmd.DouyinBili) > 0 { | if zhios_order_relate_utils.StrToFloat64(rmd.DouyinBili) > 0 { | ||||
| total -= int64(zhios_order_relate_utils.StrToFloat64(rmd.DouyinBili) * 1e4) | |||||
| total -= int64(zhios_order_relate_utils.StrToFloat64(rmd.DouyinBili) * 1e6) | |||||
| } | } | ||||
| fee = float64(total) / 1e4 | |||||
| fee = float64(total) / 1e6 | |||||
| if fee < 0 { | if fee < 0 { | ||||
| fee = 0 | fee = 0 | ||||
| } | } | ||||
| @@ -631,11 +631,11 @@ func CommFee(fee float64, opt *comm_plan.PlanOpt, types string, rmd *md.Commissi | |||||
| regionSubFeeFirst := feeFirst * opt.RegionSubRate | regionSubFeeFirst := feeFirst * opt.RegionSubRate | ||||
| // 剩余可分配的佣金 | // 剩余可分配的佣金 | ||||
| totalFirst := int64(feeFirst*1e4) - int64(pvdFeeFirst*1e4) - int64(sysFeeFirst*1e4) - int64(regionFeeFirst*1e4) - int64(regionSubFeeFirst*1e4) - int64(globalFeeFirst*1e4) - int64(selfBuyGlobalFeeFirst*1e4) - int64(pushHandFeeFirst*1e4) - int64(merchantFeeFirst*1e4) - int64(newAgentFeeFirst*1e4) | |||||
| totalFirst := int64(feeFirst*1e6) - int64(pvdFeeFirst*1e6) - int64(sysFeeFirst*1e6) - int64(regionFeeFirst*1e6) - int64(regionSubFeeFirst*1e6) - int64(globalFeeFirst*1e6) - int64(selfBuyGlobalFeeFirst*1e6) - int64(pushHandFeeFirst*1e6) - int64(merchantFeeFirst*1e6) - int64(newAgentFeeFirst*1e6) | |||||
| for _, v := range opt.RateList { | for _, v := range opt.RateList { | ||||
| totalFirst -= int64(feeFirst * (v / 100) * 1e4) | |||||
| totalFirst -= int64(feeFirst * (v / 100) * 1e6) | |||||
| } | } | ||||
| feeFirst = float64(totalFirst) / 1e4 | |||||
| feeFirst = float64(totalFirst) / 1e6 | |||||
| if feeFirst < 0 { | if feeFirst < 0 { | ||||
| feeFirst = 0 | feeFirst = 0 | ||||
| // | // | ||||