From 52b4d8d25c348eb641fa3c0959b604f2b2e3626a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 三月 2023 16:35:46 +0800
Subject: [PATCH] 版本管理，发票管理
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
index 4d5b211..dc3122b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -152,13 +152,13 @@
for (TBranchOfficeResp tBranchOfficeResp : tBranchOfficeRespList) {
- List<TOrder> orderList = orders.stream().filter(t -> t.getBranchOfficeId().equals(tBranchOfficeResp.getId())).collect(Collectors.toList());
+ List<TOrder> orderList = orders.stream().filter(t -> tBranchOfficeResp.getId().equals(t.getBranchOfficeId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(orderList)){
// 订单数据
tBranchOfficeResp.setOrderCount(orderList.size());// 订单数量
- List<TOrder> effectiveOrder = orderList.stream().filter(order -> order.getPayMoney().compareTo(new BigDecimal("15")) > 0).collect(Collectors.toList());
+ List<TOrder> effectiveOrder = orderList.stream().filter(order -> Objects.nonNull(order.getPayMoney()) && order.getPayMoney().compareTo(new BigDecimal("15")) > 0).collect(Collectors.toList());
tBranchOfficeResp.setEffectiveOrderCount(effectiveOrder.size());// 有效订单
// 优惠券数据,,,通过订单找到该区域的下单人，找出优惠券信息
@@ -218,6 +218,9 @@
}
tBranchOffice.setDistrictName(area.getName());
tBranchOffice.setDistrictCode(area.getCode());
+ }else {
+ tBranchOffice.setDistrictName("");
+ tBranchOffice.setDistrictCode("");
}
// 通过省市查询代理商
--
Gitblit v1.7.1