平台计算佣金按照实际到账金额计算

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -280,15 +280,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 //计算分销商的利润
                 DistributorProfit distributorProfit = new DistributorProfit();
 
-                //平台服务费，默认15%
-               /* CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findById(auctionConfig.getCreatorId());
-                double channelCostRebate = 0.15;
-                if (collectorWhiteList != null) {
-                    BigDecimal channelCost = collectorWhiteList.getChannelCostRebate();
-                    channelCost = PriceUtil.convertToDivide(channelCost);
-                    channelCostRebate = channelCost.doubleValue();
-                }
-                logger.info("藏家id:{} 生成新拍卖订单，平台服务费比例:{}", auctionConfig.getCreatorId(), channelCostRebate);*/
                 SupplierItem supplierItem = supplierItemDao.findById(dto.getItemId());
                 //查询该用户和藏家的介绍人
                 FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
@@ -297,12 +288,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto);
                 double introduceCost = distributionOrder.getAmount().doubleValue() * rebate;
 
-                //拍卖的平台佣金= 订单金额 - 藏家供货价 - 介绍佣金
-                double channelServiceCost = distributionOrder.getAmount().doubleValue() - supplierItem.getSupplyPrice() - introduceCost;
-                distributorProfit.setChannelCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelServiceCost)));
-
                 //实际订单到账金额
                 double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE);
+
+                //拍卖的平台佣金= 实际订单到账金额 - 藏家供货价 - 介绍佣金
+                double channelServiceCost =realAmount - supplierItem.getSupplyPrice() - introduceCost;
+                distributorProfit.setChannelCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(channelServiceCost)));
+
                 distributorProfit.setIntroduceCost(PriceUtil.convertPriceFromStr(PriceUtil.convertDoubleToString(introduceCost)));
 
                 distributorProfit.setDistributionOrderId(distributionOrderId);
@@ -451,12 +443,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 channelCostRebate = channelCost.doubleValue();
             }
             logger.info("藏家id:{} 生成新订单，平台服务费比例:{}", supplierItem.getCreatorId(), channelCostRebate);
-            //平台佣金还要减去微信的服务手续费1%，实际上平台佣金就是订单金额* (平台佣金比例（默认0.15）- 微信手续费(0.01))
-            double channelServiceCost = distributionOrder.getAmount().doubleValue() * (channelCostRebate - CommConsts.WX_COMMISSION_REBATE);
 
             //实际订单到账金额
             double realAmount = distributionOrder.getAmount().doubleValue() * (1 - CommConsts.WX_COMMISSION_REBATE);
 
+            //平台佣金还要减去微信的服务手续费1%，实际上平台佣金就是订单金额* (平台佣金比例（默认0.15）- 微信手续费(0.01))
+            double channelServiceCost = realAmount * (channelCostRebate - CommConsts.WX_COMMISSION_REBATE);
+
             //介绍人分佣,自己推荐获得的订单无需计算介绍佣金
             double rebate = distributorProfitService.getIntroduceRebate(followFansRecordRequestDto);
             double introduceCost = distributionOrder.getAmount().doubleValue() * rebate;