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


@@ -205,6 +205,7 @@


      Map<String, Object> map = new HashMap<>();


      int size = this.baseMapper.getMyChargingOrderList(appUserId, 1, null, null).size();


      map.put("number", size);


      query.setPageCurr((query.getPageCurr() - 1) * query.getPageSize());


      List<TChargingOrder> list = this.baseMapper.getMyChargingOrderList(appUserId, query.getType(), query.getPageCurr(), query.getPageSize());


      List<MyChargingOrderList> orderLists = new ArrayList<>();


      for (TChargingOrder tChargingOrder : list) {


@@ -317,6 +318,8 @@


   @Override


   public List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query) {


      Long appUserId = tokenService.getLoginUserApplet().getUserId();


		


      query.setPageCurr((query.getPageCurr() - 1) * query.getPageSize());


      List<TChargingOrder> orderList = this.baseMapper.getNoInvoicedOrder(appUserId, query.getMonth(), query.getPageCurr(), query.getPageSize());


      List<MyChargingOrderList> list = new ArrayList<>();


      for (TChargingOrder tChargingOrder : orderList) {


@@ -1409,6 +1412,7 @@


      PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());


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


      for (ChargingOrderListVO chargingOrderListVO : list) {


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


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


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


         integers.add(chargingOrderListVO.getSiteId());


@@ -1452,7 +1456,7 @@


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


                  }


               }


               if (data3 != null) chargingOrderListVO.setPhone(data3.getPhone());


               chargingOrderListVO.setPhone(data3.getPhone());




            }


         }