Commit 323ca721 authored by shiyu's avatar shiyu

计算用户账单,不考虑微信手续费

parent 1c363eb7
...@@ -291,8 +291,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -291,8 +291,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
//实际订单到账金额 //实际订单到账金额
double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE); double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE);
//拍卖的平台佣金= 实际订单到账金额 - 藏家供货价 - 介绍佣金 //拍卖的平台佣金= 订单金额 - 藏家供货价 - 介绍佣金
double channelServiceCost =realAmount - supplierItem.getSupplyPrice() - introduceCost; double channelServiceCost = distributionOrder.getAmount().doubleValue() - supplierItem.getSupplyPrice() - introduceCost;
distributorProfit.setChannelCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelServiceCost))); distributorProfit.setChannelCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelServiceCost)));
distributorProfit.setIntroduceCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(introduceCost))); distributorProfit.setIntroduceCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(introduceCost)));
...@@ -448,7 +448,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -448,7 +448,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE); double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE);
//平台佣金还要减去微信的服务手续费1%,实际上平台佣金就是订单金额* (平台佣金比例(默认0.15)- 微信手续费(0.01)) //平台佣金还要减去微信的服务手续费1%,实际上平台佣金就是订单金额* (平台佣金比例(默认0.15)- 微信手续费(0.01))
double channelServiceCost = realAmount * (channelCostRebate - CommConsts.WX_COMMISSION_REBATE); //暂时先不考虑
double channelServiceCost = distributionOrder.getAmount().doubleValue() * channelCostRebate;
//介绍人分佣,自己推荐获得的订单无需计算介绍佣金 //介绍人分佣,自己推荐获得的订单无需计算介绍佣金
double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto); double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment