From 8596db588fed82c7fc97046fed3b228ac7545187 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 九月 2024 18:35:45 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
index 8578475..f33274d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -250,14 +250,11 @@
public PageInfo<TOrderInvoiceVO> pageList(TOrderInvoiceQuery query) {
List<TAppUser> tAppUsers = new ArrayList<>();
// 查询申请用户
- if (org.springframework.util.StringUtils.hasLength(query.getUserPhone())){
- tAppUsers = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
- if(CollectionUtils.isEmpty(tAppUsers)){
- return new PageInfo<>();
- }
+ List<TAppUser> userList = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
+ if(CollectionUtils.isEmpty(userList)){
+ return new PageInfo<>();
}
-
- query.setUserIds(tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()));
+ query.setUserIds(userList.stream().map(TAppUser::getId).collect(Collectors.toList()));
PageInfo<TOrderInvoiceVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<TOrderInvoiceVO> list = this.baseMapper.pageList(query,pageInfo);
for (TOrderInvoiceVO tOrderInvoiceVO : list) {
@@ -274,15 +271,14 @@
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(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());
+ e.setUserPhone(userList.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
});
pageInfo.setRecords(list);
@@ -306,14 +302,6 @@
@Override
public List<TOrderInvoiceVO> export(TOrderInvoiceQuery query) {
- List<TAppUser> tAppUsers = new ArrayList<>();
- // 查询申请用户
- if (org.springframework.util.StringUtils.hasLength(query.getUserPhone())){
- tAppUsers = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
- if(CollectionUtils.isEmpty(tAppUsers)){
- return new ArrayList<TOrderInvoiceVO>();
- }
- }
// 查询申请用户
List<TAppUser> userList = appUserClient.selectByPhoneLike(query.getUserPhone()).getData();
if(CollectionUtils.isEmpty(userList)){
@@ -325,15 +313,14 @@
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(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());
+ e.setUserPhone(userList.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
});
return list;
}
--
Gitblit v1.7.1