From aa8c4960f607428fa2db9c714f57f83c27433ed8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 22 Nov 2023 19:16:27 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=92=B1=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/api/uniapp/MemberController.java | 4 ++-- .../jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 5abfdf08e..85fba44c3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -145,13 +145,13 @@ public class MemberController extends BaseController { RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); - logger.info("查询账户总余额 param memberId:{}", memberId); + logger.info("查询用户账户信息 param memberId:{}", memberId); MemberVO memberVO = memberService.getMemberInfoByMemberId(memberId); response = new RestApiResponse<>(memberVO); }catch (BusinessException e) { response = new RestApiResponse<>(e.getCode(), e.getMessage()); }catch (Exception e) { - logger.error("查询用户账户总余额异常", e); + logger.error("查询用户账户信息", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_MEMBER_ACCOUNT_AMOUNT_ERROR); } logger.info("查询用户账户信息 result:{}", response); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 932f6c4eb..77a794c00 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -326,13 +326,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { } BigDecimal totalAccountAmount = BigDecimal.ZERO; + BigDecimal principalBalance = BigDecimal.ZERO; if (StringUtils.isNotBlank(merchantId)) { MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(memberId, merchantId); if (memberWalletInfo != null) { totalAccountAmount = memberWalletInfo.getPrincipalBalance(); + principalBalance = memberWalletInfo.getPrincipalBalance(); } } vo.setTotalAccountAmount(totalAccountAmount); + vo.setPrincipalBalance(principalBalance); // 查询用户车牌号 MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();