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 aab943325..22c5b9c8b 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 @@ -68,6 +68,11 @@ public class JumpController extends BaseController { logger.error("修改第三方平台枪口状态 error", e); } + // 如果pileSN长度为8位需要解析一下 + if (pileSn.length() == 8) { + pileSn = YouDianUtils.resolvePhysicalId(pileSn); + } + try { // 进入充电桩详情做一下鉴权 String memberId = getMemberIdByAuthorization(request); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java index 58ad47cb8..fa75ec6b5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java @@ -194,14 +194,14 @@ public class MemberController extends BaseController { * * @return 用户账户信息 */ - @GetMapping("/getMemberInfo") - public RestApiResponse getMemberInfo(HttpServletRequest request) { + @GetMapping("/getMemberInfo/{merchantId}") + public RestApiResponse getMemberInfo(HttpServletRequest request, @PathVariable("merchantId") String merchantId) { RestApiResponse response = null; String memberId = null; try { memberId = getMemberIdByAuthorization(request); // logger.info("查询用户账户信息 param memberId:{}", memberId); - MemberVO memberVO = memberService.getMemberInfoByMemberId(memberId); + MemberVO memberVO = memberService.getMemberInfoByMemberId(memberId, merchantId); response = new RestApiResponse<>(memberVO); } catch (BusinessException e) { response = new RestApiResponse<>(e.getCode(), e.getMessage()); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 6cca683f9..456a7d0b5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -388,6 +388,11 @@ public class MemberService { return memberVO; } + public MemberVO getMemberInfoByMemberId(String memberId, String merchantId) { + MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId, merchantId); + return memberVO; + } + /** * 查询用户账户余额变动信息 *