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


@@ -1275,12 +1275,12 @@


      List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);


      for (ChargingOrderListVO chargingOrderListVO : list) {


         chargingOrderListVO.setChargingCapacity(chargingOrderListVO.getElectricity());


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getOrderAmount());


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getPaymentAmount());


         BigDecimal bigDecimal = new BigDecimal("0.006");


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


            chargingOrderListVO.setCommissionAmount(chargingOrderListVO.getServiceCharge().multiply(bigDecimal));


         }


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getResidualAmount()==null?chargingOrderListVO.getPaymentAmount():chargingOrderListVO.getPaymentAmount().subtract(chargingOrderListVO.getResidualAmount()));


         chargingOrderListVO.setPaymentAmount(chargingOrderListVO.getResidualAmount()==null?chargingOrderListVO.getPaymentAmount():chargingOrderListVO.getPaymentAmount());


         chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");


         List<Integer> integers = new ArrayList<>();


         integers.add(chargingOrderListVO.getSiteId());


@@ -1321,7 +1321,9 @@


                  carId.add(chargingOrderListVO.getAppUserCarId());


                  if (!carId.isEmpty()){


                     List<TAppUserCar> data4 = appUserCarClient.getCarByIds(carId).getData();


                     if (data4!=null && !data4.isEmpty()) chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());


                     if (data4!=null && !data4.isEmpty()) {


                        chargingOrderListVO.setLicensePlate(data4.get(0).getLicensePlate());


                     }


                  }


               }


               chargingOrderListVO.setPhone(data3.getPhone());


@@ -1402,7 +1404,7 @@


      for (ChargingOrderListVO chargingOrderListVO : list1) {


         if (chargingOrderListVO.getChargingCapacity()!=null)electronic = electronic.add(chargingOrderListVO.getElectricity());




         if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getOrderAmount());


         if (chargingOrderListVO.getPaymentAmount()!=null)paymentAmount = paymentAmount.add(chargingOrderListVO.getPaymentAmount());


         if (chargingOrderListVO.getElectrovalence()!=null)electrovalence = electrovalence.add(chargingOrderListVO.getElectrovalence());


         if (chargingOrderListVO.getServiceCharge()!=null)serviceCharge = serviceCharge.add(chargingOrderListVO.getServiceCharge());


         List<TChargingOrderAccountingStrategy> list2 = chargingOrderAccountingStrategyService.lambdaQuery()