mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-13 14:30:08 +08:00
update 电单车
This commit is contained in:
@@ -68,6 +68,11 @@ public class JumpController extends BaseController {
|
|||||||
logger.error("修改第三方平台枪口状态 error", e);
|
logger.error("修改第三方平台枪口状态 error", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 如果pileSN长度为8位需要解析一下
|
||||||
|
if (pileSn.length() == 8) {
|
||||||
|
pileSn = YouDianUtils.resolvePhysicalId(pileSn);
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// 进入充电桩详情做一下鉴权
|
// 进入充电桩详情做一下鉴权
|
||||||
String memberId = getMemberIdByAuthorization(request);
|
String memberId = getMemberIdByAuthorization(request);
|
||||||
|
|||||||
@@ -194,14 +194,14 @@ public class MemberController extends BaseController {
|
|||||||
*
|
*
|
||||||
* @return 用户账户信息
|
* @return 用户账户信息
|
||||||
*/
|
*/
|
||||||
@GetMapping("/getMemberInfo")
|
@GetMapping("/getMemberInfo/{merchantId}")
|
||||||
public RestApiResponse<?> getMemberInfo(HttpServletRequest request) {
|
public RestApiResponse<?> getMemberInfo(HttpServletRequest request, @PathVariable("merchantId") String merchantId) {
|
||||||
RestApiResponse<?> response = null;
|
RestApiResponse<?> response = null;
|
||||||
String memberId = null;
|
String memberId = null;
|
||||||
try {
|
try {
|
||||||
memberId = getMemberIdByAuthorization(request);
|
memberId = getMemberIdByAuthorization(request);
|
||||||
// logger.info("查询用户账户信息 param memberId:{}", memberId);
|
// logger.info("查询用户账户信息 param memberId:{}", memberId);
|
||||||
MemberVO memberVO = memberService.getMemberInfoByMemberId(memberId);
|
MemberVO memberVO = memberService.getMemberInfoByMemberId(memberId, merchantId);
|
||||||
response = new RestApiResponse<>(memberVO);
|
response = new RestApiResponse<>(memberVO);
|
||||||
} catch (BusinessException e) {
|
} catch (BusinessException e) {
|
||||||
response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
||||||
|
|||||||
@@ -388,6 +388,11 @@ public class MemberService {
|
|||||||
return memberVO;
|
return memberVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MemberVO getMemberInfoByMemberId(String memberId, String merchantId) {
|
||||||
|
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId, merchantId);
|
||||||
|
return memberVO;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询用户账户余额变动信息
|
* 查询用户账户余额变动信息
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user