From 30ac54d0b86eb2574d615a16e884a6269fa8f764 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Thu, 4 Jul 2024 18:03:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=E6=8A=95=E9=80=92=E3=80=81?=
 =?UTF-8?q?=E6=B8=85=E8=BF=90=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RecycleCleanOrderServiceImpl.java        | 15 ++++++++++-----
 .../impl/RecycleDeliveryOrderServiceImpl.java     | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
index f187273..5ea61b6 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
@@ -376,12 +376,17 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
     @Override
     public List<OrderStatisticsResponse> cleanCount(OrderStatisticsRequest request) {
         log.info("查询清运统计，request:{}", request);
-        if (StringUtils.isBlank(request.getCompanyId())) {
-            return Collections.emptyList();
-        }
         List<String> finalDeviceCodes = Lists.newArrayList();
-        //只勾选了商户 则查询商户底下的所有设备编码
-        if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+        if (StringUtils.isBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+            //获取当前商户id
+            List<String> stationIds = recycleDeviceService.getStationByCompanyId(userProvider.get().getOrganizeId());
+            if (CollectionUtils.isEmpty(stationIds)) {
+                return Collections.emptyList();
+            }
+            List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
+            finalDeviceCodes.addAll(deviceCodes);
+        } else if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+            //只勾选了商户 则查询商户底下的所有设备编码
             List<String> stationIds = recycleDeviceService.getStationByCompanyId(request.getCompanyId());
             List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
             finalDeviceCodes.addAll(deviceCodes);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
index cc3e7fc..98eb6a5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
@@ -657,11 +657,16 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
     public List<OrderStatisticsResponse> deliveryCount(OrderStatisticsRequest request) {
         log.info("查询投递统计，request:{}", request);
         List<String> finalDeviceCodes = Lists.newArrayList();
-        if (StringUtils.isBlank(request.getCompanyId())) {
-            return Collections.emptyList();
-        }
-        //只勾选了商户 则查询商户底下的所有设备编码
-        if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+        if (StringUtils.isBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+            //获取当前商户id
+            List<String> stationIds = recycleDeviceService.getStationByCompanyId(userProvider.get().getOrganizeId());
+            if (CollectionUtils.isEmpty(stationIds)) {
+                return Collections.emptyList();
+            }
+            List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
+            finalDeviceCodes.addAll(deviceCodes);
+        } else if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
+            //只勾选了商户 则查询商户底下的所有设备编码
             List<String> stationIds = recycleDeviceService.getStationByCompanyId(request.getCompanyId());
             List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
             finalDeviceCodes.addAll(deviceCodes);