Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-12 47a0da038edf0d7743662fd65666d2f49e841818

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java

@@ -256,7 +256,6 @@
            return new PageInfo<>();
         }
      }

      query.setUserIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
      PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo);
@@ -279,10 +278,12 @@
         e.setServiceTariff(orderInvoiceDetailList.get(0).getServiceTariff());
         e.setElectricityTariff(orderInvoiceDetailList.get(0).getElectricityTariff());
         e.setAddedServiceTariff(orderInvoiceDetailList.get(0).getAddedServiceTariff());
         e.setAddedService(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());
         e.setElectrovalence(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());
         e.setServiceCharge(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());
         e.setUserPhone(finalTAppUsers.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
         e.setAddedService(orderInvoiceDetailList.stream().filter(t->t.getAddedService()!=null).map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());
         e.setElectrovalence(orderInvoiceDetailList.stream().filter(t->t.getElectrovalence()!=null).map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());
         e.setServiceCharge(orderInvoiceDetailList.stream().filter(t->t.getServiceCharge()!=null).map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());
         if (e.getBillingUserId()!=null){
            e.setUserPhone(finalTAppUsers.stream().filter(t->t.getId()!=null).filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
         }
      });

      pageInfo.setRecords(list);
@@ -292,39 +293,50 @@
   @Override
   public Map<String, Integer> statusCount(TOrderInvoiceQuery query) {
      Map<String, Integer> map = new HashMap<>();
      List<TAppUser> userList = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
      if(CollectionUtils.isEmpty(userList)){
         map.put("notAccepted",0);
         map.put("processing",0);
         map.put("finished",0);
         return map;
      List<TAppUser> tAppUsers = new ArrayList<>();

      if (org.springframework.util.StringUtils.hasLength(query.getUserPhone())){
   tAppUsers = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
         if(CollectionUtils.isEmpty(tAppUsers)){
            map.put("notAccepted",0);
            map.put("processing",0);
            map.put("finished",0);
            return map;
         }
      }
      query.setUserIds(userList.stream().map(TAppUser::getId).collect(Collectors.toList()));

      query.setUserIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
      map = this.baseMapper.statusCount(query);
      return map;
   }

   @Override
   public List<TOrderInvoiceVO> export(TOrderInvoiceQuery query) {
      List<TAppUser> tAppUsers = new ArrayList<>();
      // 查询申请用户
      List<TAppUser> userList = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
      if(CollectionUtils.isEmpty(userList)){
         return new ArrayList<>();
      if (org.springframework.util.StringUtils.hasLength(query.getUserPhone())){
         tAppUsers = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
         if(CollectionUtils.isEmpty(tAppUsers)){
            return new ArrayList<TOrderInvoiceVO>();
         }
      }
      query.setUserIds(userList.stream().map(TAppUser::getId).collect(Collectors.toList()));
      query.setUserIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
      PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<TOrderInvoiceVO> list = this.baseMapper.export(query);
      List<Long> ids = list.stream().map(TOrderInvoiceVO::getId).collect(Collectors.toList());
      List<TOrderInvoiceDetail> orderInvoiceDetailList = orderInvoiceDetailService.list(new LambdaQueryWrapper<TOrderInvoiceDetail>()
            .in(TOrderInvoiceDetail::getOrderInvoiceId, ids));
      List<TAppUser> finalTAppUsers = tAppUsers;
      list.forEach(e->{
         e.setServiceTariff(orderInvoiceDetailList.get(0).getServiceTariff());
         e.setElectricityTariff(orderInvoiceDetailList.get(0).getElectricityTariff());
         e.setAddedServiceTariff(orderInvoiceDetailList.get(0).getAddedServiceTariff());
         e.setAddedService(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());
         e.setElectrovalence(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());
         e.setServiceCharge(orderInvoiceDetailList.stream().map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());
         e.setUserPhone(userList.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
         e.setAddedService(orderInvoiceDetailList.stream().filter(t->t.getAddedService()!=null).map(TOrderInvoiceDetail::getAddedService).reduce(BigDecimal::add).get());
         e.setElectrovalence(orderInvoiceDetailList.stream().filter(t->t.getElectrovalence()!=null).map(TOrderInvoiceDetail::getElectrovalence).reduce(BigDecimal::add).get());
         e.setServiceCharge(orderInvoiceDetailList.stream().filter(t->t.getServiceCharge()!=null).map(TOrderInvoiceDetail::getServiceCharge).reduce(BigDecimal::add).get());
         if (e.getBillingUserId()!=null){
            e.setUserPhone(finalTAppUsers.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
         }
      });
      return list;
   }