From 544319bf9595a693c3a5e90ec0b7120356f9bc03 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 23 Aug 2023 10:23:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 9 ++++++++- .../common/LTYTCommonParams.java | 2 +- .../common/LTYTCommonResult.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyun => lutongyunting}/common/LTYTCommonParams.java (93%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyun => lutongyunting}/common/LTYTCommonResult.java (82%) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 09a79d041..cfcddeed4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -277,7 +277,14 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { // 查询枪口当前订单 for (PileConnectorInfoVO pileConnectorInfoVO : pileConnectorInfoList) { String pileConnectorCode = pileConnectorInfoVO.getPileConnectorCode(); - pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码 + // 通过stationId查询充电站信息（缓存方法） + PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileConnectorInfoVO.getStationId()); + if (stationInfo != null && StringUtils.isNotBlank(stationInfo.getQrcodePrefix())) { + String connectorQrCodeUrl = stationInfo.getQrcodePrefix() + pileConnectorCode; + pileConnectorInfoVO.setConnectorQrCodeUrl(connectorQrCodeUrl); + }else { + pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码 + } OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode); if (order != null) { pileConnectorInfoVO.setOrderCode(order.getOrderCode()); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java index fa74ecfc4..8f3563db8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyun.common; +package com.jsowell.thirdparty.lutongyunting.common; import lombok.Data; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java similarity index 82% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java index 31d0f54e3..d21570b0f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyun.common; +package com.jsowell.thirdparty.lutongyunting.common; import lombok.Data;