From f651383a877e05c9c7e77e79daa2f64296d8a9a8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 17 Aug 2023 15:42:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?id=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/api/uniapp/PileController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 9512d672a..6eb1c6c2f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -7,6 +7,7 @@ import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand; import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.QueryStationDTO; @@ -41,6 +42,9 @@ public class PileController extends BaseController { @Autowired private IPileBillingTemplateService pileBillingTemplateService; + @Autowired + private IPileMerchantInfoService pileMerchantInfoService; + /** * 查询充电站信息列表(主页) @@ -52,6 +56,13 @@ public class PileController extends BaseController { logger.info("查询充电站信息列表 param:{}", JSONObject.toJSONString(queryStationDTO)); RestApiResponse response = null; try { + // 获取appid（第三方平台用） + String appId = request.getHeader("appId"); + if (StringUtils.isNotBlank(appId)) { + // 获取merchantId + String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId); + queryStationDTO.setMerchantId(merchantId); + } PageResponse pageResponse = pileStationInfoService.uniAppQueryStationInfoList(queryStationDTO); response = new RestApiResponse<>(pageResponse); } catch (BusinessException e) {