From 4d38858c862472310edacbc58e7c16370d15d09f Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 9 Sep 2024 20:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/PileService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 494545032..28848ed1f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -200,13 +200,17 @@ public class PileService { all.join(); all.get(); List connectorInfoList = connectorInfoListFuture.get(); + // List connectorInfoList = pileConnectorInfoService.selectConnectorInfoList(pileSn); log.info("查询充电枪口详情-connectorInfoList:{}", JSON.toJSONString(connectorInfoList)); // PileStationVO pileStationVO = pileStationVOFuture.get(); MerchantInfoVO merchantInfoVO = merchantInfoVOFuture.get(); - log.info("查询充电枪口详情-merchantInfoVO:{}", JSON.toJSONString(connectorInfoList)); + // List billingPriceVOS= pileBillingTemplateService.queryBillingPrice(pileInfoVO.getStationId()); + log.info("查询充电枪口详情-merchantInfoVO:{}", JSON.toJSONString(merchantInfoVO)); List billingPriceVOS = billingPriceFuture.get(); + // MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(pileInfoVO.getMerchantId()); log.info("查询充电枪口详情-billingPriceVOS:{}", JSON.toJSONString(billingPriceVOS)); + AppletPileDetailVO vo = AppletPileDetailVO.builder() .pileInfo(pileInfoVO) .connectorInfoList(connectorInfoList)