Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
| | |
| | | // 累加平台手续费 |
| | | if (tChargingOrder.getServiceCharge()!=null){ |
| | | commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006"))); |
| | | commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getCommissionAmount().multiply(new BigDecimal("0.006"))); |
| | | commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006"))); |
| | | } |
| | | // 累加平台分佣 |
| | | if (tChargingOrder.getSharingAmount()!=null){ |