From e5b1e6290a8e03871958848c7a03eb5a637e8826 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 九月 2024 17:57:28 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 82a63c0..8578475 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
@@ -306,6 +306,14 @@
@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)){
@@ -317,6 +325,7 @@
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());
@@ -324,7 +333,7 @@
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.setUserPhone(finalTAppUsers.stream().filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
});
return list;
}
--
Gitblit v1.7.1