对账

无关风月

2025-02-18 486cd6ce0541b09a8d88c08ed51c75c844090972

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java

@@ -325,6 +325,8 @@
                        tChargingOrder.setLicensePlate(data4.getLicensePlate());
                        tChargingOrder.setVehicleModel(data4.getVehicleModel());
                    }
                }else{
                    tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
                }
                if (data3!=null)tChargingOrder.setUserName(data3.getName());
                // 累加实收金额 支付结算金额
@@ -352,7 +354,7 @@
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
@@ -464,7 +466,7 @@
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
@@ -754,6 +756,8 @@
                        tChargingOrder.setLicensePlate(tAppUserCar.getLicensePlate());
                        tChargingOrder.setVehicleModel(tAppUserCar.getVehicleModel());
                    }
                }else{
                    tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
                }
                if (data3!=null)tChargingOrder.setUserName(data3.getName());
                if ( tChargingOrder.getPaymentAmount()!=null){
@@ -776,7 +780,7 @@
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣
@@ -884,8 +888,8 @@
                }
                // 累加平台手续费
                if (tChargingOrder.getOrderAmount()!=null){
                    commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
                    commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
                            .setScale(2,BigDecimal.ROUND_DOWN));
                }
                // 累加平台分佣