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) {