明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-09-10 6b4c5c2630674b5986d89664214e0262511269eb 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java


@@ -77,7 +77,10 @@


        ChargingBillVO res1 = chargingBillService.chargingBillList1(dto);


        List<ChargingBillListVO> records = res1.getList().getRecords();


        accountListVO.setBillCount(records.size());


        accountListVO.setTotalAmount(res1.getPaymentAmount().subtract(res1.getRefundAmount()).subtract(res1.getCommissionAmount()).subtract(res1.getSharingAmount()));


        accountListVO.setTotalAmount(


                res1.getPaymentAmount().subtract(res1.getRefundAmount()==null?BigDecimal.ZERO:res1.getRefundAmount())


                        .subtract(res1.getCommissionAmount()==null?BigDecimal.ZERO:res1.getCommissionAmount())


                        .subtract(res1.getSharingAmount()==null?BigDecimal.ZERO:res1.getSharingAmount()));


        accountListVO.setPaymentAmount(res1.getPaymentAmount());


        accountListVO.setRefundAmount(res1.getRefundAmount());


        accountListVO.setCommissionAmount(res1.getCommissionAmount());