From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 b48a88e..e831ef1 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
@@ -18,6 +18,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
@@ -48,6 +49,9 @@
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)){
+ return new PageInfo<>();
+ }
// 查询当前页的订单
List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
.in(TChargingOrder::getId, orderIds));
@@ -59,17 +63,20 @@
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());
+ if(Objects.nonNull(siteNameVO)){
+ 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);
}
+ item.setOrderIdStr(item.getOrderId().toString());
});
list.forEach(e->e.setUid(e.getId().toString()));
pageInfo.setRecords(list);
@@ -86,12 +93,21 @@
TChargingOrder tChargingOrder = chargingOrderMapper.selectById(orderAppeal.getOrderId());
orderAppealVO.setChargingOrder(tChargingOrder);
if(Objects.nonNull(tChargingOrder)){
+ SiteNameVO siteNameVO = chargingGunClient.getAllInfoById(tChargingOrder.getChargingGunId()).getData();
+ if(Objects.nonNull(siteNameVO)){
+ orderAppealVO.setGunName(siteNameVO.getGunName());
+ orderAppealVO.setGunNumber(siteNameVO.getGunNumber());
+ orderAppealVO.setPileName(siteNameVO.getPileName());
+ orderAppealVO.setPileNumber(siteNameVO.getPileNumber());
+ orderAppealVO.setSiteName(siteNameVO.getSiteName());
+ }
orderAppealVO.setEndMode(tChargingOrder.getEndMode());
}
}else if (orderAppeal.getOrderType() == 2) {
TShoppingOrder tShoppingOrder = shoppingOrderMapper.selectById(orderAppeal.getOrderId());
setGoodsInfo(orderAppealVO,tShoppingOrder);
}
+ orderAppealVO.setOrderIdStr(orderAppealVO.getOrderId().toString());
return orderAppealVO;
}
--
Gitblit v1.7.1