|
@@ -588,8 +588,8 @@ func CommFee(fee float64, opt *comm_plan.PlanOpt, types string, rmd *md.Commissi |
|
|
if isGoods == "1" { |
|
|
if isGoods == "1" { |
|
|
orderBeforeRate := fee * opt.OrderBeforeRate |
|
|
orderBeforeRate := fee * opt.OrderBeforeRate |
|
|
orderBeforeRateFirst := feeFirst * opt.OrderBeforeRate |
|
|
orderBeforeRateFirst := feeFirst * opt.OrderBeforeRate |
|
|
fee1 := int64(fee*1e4) - int64(orderBeforeRate*1e4) |
|
|
|
|
|
feeFirst1 := int64(feeFirst*1e4) - int64(orderBeforeRateFirst*1e4) |
|
|
|
|
|
|
|
|
fee1 := int64(fee*1e9) - int64(orderBeforeRate*1e9) |
|
|
|
|
|
feeFirst1 := int64(feeFirst*1e9) - int64(orderBeforeRateFirst*1e9) |
|
|
if opt.PointType == 1 { //四舍五入 |
|
|
if opt.PointType == 1 { //四舍五入 |
|
|
fee, _ = decimal.NewFromFloat(float64(fee1) / 10000).Round(2).Float64() |
|
|
fee, _ = decimal.NewFromFloat(float64(fee1) / 10000).Round(2).Float64() |
|
|
feeFirst, _ = decimal.NewFromFloat(float64(feeFirst1) / 10000).Round(2).Float64() |
|
|
feeFirst, _ = decimal.NewFromFloat(float64(feeFirst1) / 10000).Round(2).Float64() |
|
@@ -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*1e9) - int64(pvdFee*1e9) - int64(sysFee*1e9) - int64(regionFee*1e9) - int64(regionSubFee*1e9) - int64(globalFee*1e9) - int64(selfBuyGlobalFee*1e9) - int64(pushHandFee*1e9) - int64(merchantFee*1e9) - int64(newAgentFee*1e9) |
|
|
for _, v := range opt.RateList { |
|
|
for _, v := range opt.RateList { |
|
|
total -= int64(fee * (v / 100) * 1e4) |
|
|
|
|
|
|
|
|
total -= int64(fee * (v / 100) * 1e9) |
|
|
} |
|
|
} |
|
|
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) * 1e9) |
|
|
} |
|
|
} |
|
|
fee = float64(total) / 1e4 |
|
|
|
|
|
|
|
|
fee = float64(total) / 1e9 |
|
|
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*1e9) - int64(pvdFeeFirst*1e9) - int64(sysFeeFirst*1e9) - int64(regionFeeFirst*1e9) - int64(regionSubFeeFirst*1e9) - int64(globalFeeFirst*1e9) - int64(selfBuyGlobalFeeFirst*1e9) - int64(pushHandFeeFirst*1e9) - int64(merchantFeeFirst*1e9) - int64(newAgentFeeFirst*1e9) |
|
|
for _, v := range opt.RateList { |
|
|
for _, v := range opt.RateList { |
|
|
totalFirst -= int64(feeFirst * (v / 100) * 1e4) |
|
|
|
|
|
|
|
|
totalFirst -= int64(feeFirst * (v / 100) * 1e9) |
|
|
} |
|
|
} |
|
|
feeFirst = float64(totalFirst) / 1e4 |
|
|
|
|
|
|
|
|
feeFirst = float64(totalFirst) / 1e9 |
|
|
if feeFirst < 0 { |
|
|
if feeFirst < 0 { |
|
|
feeFirst = 0 |
|
|
feeFirst = 0 |
|
|
// |
|
|
// |
|
|