From 226d7007a30c9cbe871812f7a73caf0be0ace72b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 九月 2024 15:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
index cd42e4f..5273411 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -49,31 +49,32 @@
         PageInfo<TOrderAppealVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
         List<TOrderAppealVO> list = this.baseMapper.pageList(query,pageInfo);
         List<Long> orderIds = list.stream().map(TOrderAppealVO::getOrderId).collect(Collectors.toList());
-        if(!CollectionUtils.isEmpty(orderIds)){
-            // 查询当前页的订单
-            List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
-                    .in(TChargingOrder::getId, orderIds));
-            List<TShoppingOrder> shoppingOrders = shoppingOrderMapper.selectList(Wrappers.lambdaQuery(TShoppingOrder.class)
-                    .in(TShoppingOrder::getId, orderIds));
-            list.forEach(item -> {
-                if (item.getOrderType() == 1) {
-                    TChargingOrder tChargingOrder = chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
-                    if(Objects.nonNull(tChargingOrder)){
-                        item.setChargingOrder(tChargingOrder);
-                        SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
-                        item.setGunName(siteNameVO.getGunName());
-                        item.setGunNumber(siteNameVO.getGunNumber());
-                        item.setPileName(siteNameVO.getPileName());
-                        item.setPileNumber(siteNameVO.getPileNumber());
-                        item.setSiteName(siteNameVO.getSiteName());
-                        item.setEndMode(tChargingOrder.getEndMode());
-                    }
-                }else if (item.getOrderType() == 2) {
-                    TShoppingOrder tShoppingOrder = shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
-                    setGoodsInfo(item,tShoppingOrder);
-                }
-            });
+        if(CollectionUtils.isEmpty(orderIds)){
+            return new PageInfo<>();
         }
+        // 查询当前页的订单
+        List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
+                .in(TChargingOrder::getId, orderIds));
+        List<TShoppingOrder> shoppingOrders = shoppingOrderMapper.selectList(Wrappers.lambdaQuery(TShoppingOrder.class)
+                .in(TShoppingOrder::getId, orderIds));
+        list.forEach(item -> {
+            if (item.getOrderType() == 1) {
+                TChargingOrder tChargingOrder = chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
+                if(Objects.nonNull(tChargingOrder)){
+                    item.setChargingOrder(tChargingOrder);
+                    SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
+                    item.setGunName(siteNameVO.getGunName());
+                    item.setGunNumber(siteNameVO.getGunNumber());
+                    item.setPileName(siteNameVO.getPileName());
+                    item.setPileNumber(siteNameVO.getPileNumber());
+                    item.setSiteName(siteNameVO.getSiteName());
+                    item.setEndMode(tChargingOrder.getEndMode());
+                }
+            }else if (item.getOrderType() == 2) {
+                TShoppingOrder tShoppingOrder = shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null);
+                setGoodsInfo(item,tShoppingOrder);
+            }
+        });
         list.forEach(e->e.setUid(e.getId().toString()));
         pageInfo.setRecords(list);
         return pageInfo;

--
Gitblit v1.7.1