明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-10-23 726ea14c21f4d17178e53a8091e26f63ab925fc1 
 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;


@@ -126,7 +127,7 @@


//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());


            // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59


            LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);


            QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()


                    .between("create_time", firstDayOfMonth, lastDayOfMonth)


                    .eq("status", 5)


@@ -333,7 +334,7 @@


//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());


            // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59


            LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);


            QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()


                    .between("create_time", firstDayOfMonth, lastDayOfMonth)


                    .eq("status", 5)


@@ -478,7 +479,7 @@


//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());


            // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59


            LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);


            QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()


                    .between("create_time", firstDayOfMonth, lastDayOfMonth)


                    .eq("status", 5)


@@ -674,7 +675,7 @@


//            LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());


            // todo 临时修改为查询昨天凌晨00:00:00 到 23：59：59


            LocalDateTime firstDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MIN);


            LocalDateTime lastDayOfMonth = LocalDateTime.of(date, LocalTime.MAX);


            QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()


                    .between("create_time", firstDayOfMonth, lastDayOfMonth)


                    .eq("status", 5)


@@ -721,9 +722,9 @@


                    serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge());


                }


                // 累加平台手续费


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


                    commissionAmount = commissionAmount.add(tChargingOrder.getCommissionAmount());


                    commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getCommissionAmount());


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


                    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){