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 1848881da..781634128 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 @@ -20,14 +20,12 @@ import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.mapper.PileBasicInfoMapper; import com.jsowell.pile.mapper.PileConnectorInfoMapper; -import com.jsowell.pile.service.IOrderBasicInfoService; -import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.service.IPileConnectorInfoService; -import com.jsowell.pile.service.IPileModelInfoService; +import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileModelInfoVO; +import com.jsowell.pile.vo.web.PileStationVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -68,6 +66,9 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { @Autowired private IOrderBasicInfoService orderBasicInfoService; + @Autowired + private IPileStationInfoService pileStationInfoService; + @Autowired private RedisCache redisCache; @@ -200,7 +201,13 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { if (Objects.nonNull(list)) { for (PileConnectorInfoVO p : list) { // p.setConnectorQrCodeUrl(URL + p.getPileConnectorCode()); - p.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(p.getPileConnectorCode())); + // 获取二维码前缀 + PileStationVO stationInfo = pileStationInfoService.getStationInfo(p.getStationId()); + if (StringUtils.isNotBlank(stationInfo.getQrcodePrefix())) { + p.setConnectorQrCodeUrl(stationInfo.getQrcodePrefix()); + }else { + p.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(p.getPileConnectorCode())); + } } } return list;