From 9af7327f475cdb51aa81cf61e86b5d9c62b89f23 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Aug 2024 19:33:32 +0800 Subject: [PATCH] update --- .../api/uniapp/business/BusinessStationInfoController.java | 6 +++--- .../pile/service/impl/PileReservationInfoServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java index 59a2cd9ac..ad29c7118 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java @@ -91,7 +91,7 @@ public class BusinessStationInfoController extends BaseController { } /** - * 查询订单数量趋势信息 + * 查询站点订单数量趋势信息 * @return */ @PostMapping("/getStationOrderQuantityInfo") @@ -101,10 +101,10 @@ public class BusinessStationInfoController extends BaseController { StationBusinessAnalyzeInfoVO vo = pileStationInfoService.getStationOrderQuantityInfo(dto); response = new RestApiResponse<>(ImmutableMap.of("stationBusinessAnalyzeInfoVO", vo)); } catch (Exception e) { - logger.error("查询订单数量趋势信息 error", e); + logger.error("查询站点订单数量趋势信息 error", e); response = new RestApiResponse<>(e); } - logger.info("查询订单数量趋势信息 params:{}, result:{}", JSONObject.toJSONString(dto), response); + logger.info("查询站点订单数量趋势信息 params:{}, result:{}", JSONObject.toJSONString(dto), response); return response; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index 8a4ce0068..435f7722b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -518,6 +518,9 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic @Override public PileReservationInfoVO queryReservationInfo(PileReservationDTO dto) { PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPileConnectorCode(dto.getPileConnectorCode()); + if (pileReservationInfo == null) { + return null; + } PileReservationInfoVO build = PileReservationInfoVO.builder() .reservedId(pileReservationInfo.getId() + "") .pileSn(pileReservationInfo.getPileSn())