diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java index 22c83c1b6..668b0b310 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java @@ -76,7 +76,7 @@ public class JumpController extends BaseController { try { // 进入充电桩详情做一下鉴权 String memberId = getMemberIdByAuthorization(request); - AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); + AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, memberId); addMember2MemberGroup(memberId, vo); response = new RestApiResponse<>(vo); } catch (BusinessException e) { @@ -114,7 +114,7 @@ public class JumpController extends BaseController { try { // 进入充电桩详情做一下鉴权 String memberId = getMemberIdByAuthorization(request); - AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); + AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, memberId); addMember2MemberGroup(memberId, vo); response = new RestApiResponse<>(vo); } catch (BusinessException e) { diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java index 246bbfdad..3b0e8256d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java @@ -42,7 +42,7 @@ public class JumpXixiaoController extends BaseController { logger.info("User-Agent:{}", request.getHeader("user-agent")); RestApiResponse response = null; try { - AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); + AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, null); response = new RestApiResponse<>(vo); } catch (BusinessException e) { logger.warn("app-xcx-h5查询充电桩详情 warn", e); @@ -65,7 +65,7 @@ public class JumpXixiaoController extends BaseController { logger.info("User-Agent:{}", request.getHeader("user-agent")); RestApiResponse response = null; try { - AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode); + AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode, null); response = new RestApiResponse<>(vo); } catch (BusinessException e) { logger.warn("app-xcx-h5查询充电枪口详情 warn param:{}", pileConnectorCode, e); 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 c77f36ab9..c54d5e45b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -254,16 +254,19 @@ public class PileService { } // 判断该桩是否为个人桩 - List memberVOS = pileMemberRelationService.selectMemberList(pileSn); - if (CollectionUtils.isNotEmpty(memberVOS)) { - // 说明为个人桩, 判断会员信息 - // 将memberId收集成list - List memberIdList = memberVOS.stream() - .map(MemberVO::getMemberId) - .collect(Collectors.toList()); - // 如果会员没有绑定该桩,说明没有权限进行操作 - if (!memberIdList.contains(memberId)) { - throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_HAVE_PILE_PERMISSION); + if (StringUtils.isNotBlank(memberId)) { + List memberVOS = pileMemberRelationService.selectMemberList(pileSn); + if (CollectionUtils.isNotEmpty(memberVOS)) { + // 说明为个人桩, 判断会员信息 + // 将memberId收集成list + List memberIdList = memberVOS.stream() + .map(MemberVO::getMemberId) + .collect(Collectors.toList()); + // 如果会员没有绑定该桩,说明没有权限进行操作 + if (!memberIdList.contains(memberId)) { + throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_HAVE_PILE_PERMISSION); + } + } } // 查询充电桩下枪口信息 @@ -345,7 +348,7 @@ public class PileService { return resultVO; } - public AppletPileDetailVO getConnectorDetailV2(String pileConnectorCode) throws Exception { + public AppletPileDetailVO getConnectorDetailV2(String pileConnectorCode, String memberId) throws Exception { log.info("查询充电枪口详情, pileConnectorCode:{}", pileConnectorCode); PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode); log.info("查询充电枪口详情, pileConnectorDetailVO:{}", JSON.toJSONString(pileConnectorDetailVO)); @@ -360,7 +363,7 @@ public class PileService { } } String pileSn = pileConnectorDetailVO.getPileSn(); - AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn); + AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn, memberId); log.info("查询充电枪口详情getConnectorDetail, pileSn:{}, pileConnectorDetailVO:{}, resultVO:{}", pileSn, JSON.toJSONString(pileConnectorDetailVO), JSON.toJSONString(resultVO)); List connectorInfoList = resultVO.getConnectorInfoList(); if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) { diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index 169d15311..3d885fb35 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -233,7 +233,7 @@ public enum ReturnCodeEnum { CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定,请检查!"), - CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息!"), + CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息!"); private String value;