明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2024-10-23 babe9c17624b964b70242d9d38d8a074e04285a8 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java


@@ -29,6 +29,7 @@




import javax.annotation.Resource;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.LocalTime;


@@ -198,7 +199,7 @@


                }


                BigDecimal add = tChargingOrder.getElectrovalence().add(tChargingOrder.getServiceCharge());


                tChargingOrder.setTotalAmount(add.toString());


                tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount().toString());


                tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");


                UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();


                if (data5!=null){


                    if (data5.getTime_remaining()!=null){


@@ -249,7 +250,7 @@


                if (tChargingOrder.getElectrovalence()!=null){


                    electrovalence = electrovalence.add(tChargingOrder.getElectrovalence());


                }


                if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus() == 2){


                if (tChargingOrder.getRefundAmount()!=null && tChargingOrder.getRefundStatus()!=null && tChargingOrder.getRefundStatus()== 2){


                    refundAmount = refundAmount.add(tChargingOrder.getRefundAmount());


                }


                // 累加累计服务费


@@ -722,8 +723,8 @@


                }


                // 累加平台手续费


                if (tChargingOrder.getServiceCharge()!=null){


                    commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006")));


                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getCommissionAmount().multiply(new BigDecimal("0.006")));


                    commissionAmount = commissionAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006")).setScale(2, RoundingMode.HALF_DOWN));


                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.006")).setScale(2, RoundingMode.HALF_DOWN));


                }


                // 累加平台分佣


                if (tChargingOrder.getSharingAmount()!=null){