|
|
@@ -597,6 +597,7 @@ func NiuBeiCalcCommission(uid, level, oldDiff, ownbuyReturnType int, fee, integr |
|
|
|
//积分扣除抽成后 |
|
|
|
var integralSysFee float64 = 0 |
|
|
|
integralFee, _, integralSysFee = CommFee(integralFee, opt, "integral", isGoods) |
|
|
|
integralFeeForPrice, _, _ := CommFee(zhios_order_relate_utils.StrToFloat64(rmd.OldPrice), opt, "integral", isGoods) |
|
|
|
// 计算自购补贴比例 |
|
|
|
subsidyFee = 0 |
|
|
|
//如果没登录,要找出权重最低的那个 |
|
|
@@ -616,7 +617,7 @@ func NiuBeiCalcCommission(uid, level, oldDiff, ownbuyReturnType int, fee, integr |
|
|
|
return 0, 0, 0, nil, errors.New("opt.UserRate[level] is nil uid=" + zhios_order_relate_utils.IntToStr(uid)) |
|
|
|
} |
|
|
|
// 获得自购的 |
|
|
|
commission, _, amountList, ratioList := comm_plan.NiuBeiCalReturnAmountAndRatio(eg, pvd, rmd.GoodsCommission, integralFee, opt) |
|
|
|
commission, _, amountList, ratioList := comm_plan.NiuBeiCalReturnAmountAndRatio(eg, pvd, rmd.GoodsCommission, integralFeeForPrice, opt) |
|
|
|
ratioListMap := convertList2Map(ratioList) |
|
|
|
for k, v := range amountList { |
|
|
|
amountList[k].Val = ratioListMap[v.Cid] * v.Val |
|
|
|