去除通道费

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java

@@ -169,20 +169,19 @@ public class WxPayCallbackController {
             SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
             //供货成本价
             Long distributionTotalPrice = supplierItem.getDistributionPrice() * distributionOrder.getItemNum();
-            //通道费
+           /* //通道费
             double channelCost = distributionOrder.getAmount().doubleValue() * 0.006;
             if (channelCost < 1) {
                 channelCost = 0;
-            }
+            }*/
             //利润
-            Double profit = distributionOrder.getAmount().doubleValue() - distributionTotalPrice.doubleValue() - channelCost;
+            Double profit = distributionOrder.getAmount().doubleValue() - distributionTotalPrice.doubleValue();
             distributorProfit.setDistributionOrderId(distributionOrderId);
             distributorProfit.setDistributorId(distributionOrder.getSellerId());
             distributorProfit.setItemId(distributionOrder.getItemId());
             distributorProfit.setItemNum(distributionOrder.getItemNum());
             distributorProfit.setAmount(distributionOrder.getAmount());
             distributorProfit.setItemCost(distributionTotalPrice);
-            distributorProfit.setChannelCost((long)Math.ceil(channelCost));
             distributorProfit.setProfit((long) Math.floor(profit));
             distributorProfit.setCreateTime(new Date());
             distributorProfit.setIsValid(true);

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

@@ -263,14 +263,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             Long distributionTotalPrice = supplierItem.getDistributionPrice() * distributionOrder.getItemNum();
             distributionOrderDetailVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(distributionTotalPrice));
             distributionOrderDetailVo.setChannelCost("6‰");
-            //通道费
+           /* //通道费
             double channelCost = distributionOrder.getAmount().doubleValue()  * 0.006;
             if (channelCost < 1) {
                 channelCost = 0;
             }
-            distributionOrderDetailVo.setChannelCost(PriceUtil.convertDoubleToString(channelCost));
+            distributionOrderDetailVo.setChannelCost(PriceUtil.convertDoubleToString(channelCost));*/
             //利润
-            Double profit = distributionOrder.getAmount().doubleValue() - distributionTotalPrice.doubleValue() - channelCost;
+            Double profit = distributionOrder.getAmount().doubleValue() - distributionTotalPrice.doubleValue();
             //支付截止时间，下单后2小时内
             Date date = distributionOrder.getCreateTime();
             Instant instant = date.toInstant().plus(Duration.ofHours(2));