From ada4555d5cbf41679bfae4f8cdfba9cb2a9fc9ed Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 22 Nov 2023 19:05:38 +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 --- .../pile/service/IMemberBasicInfoService.java | 4 +++- .../service/impl/MemberBasicInfoServiceImpl.java | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index b9e3c76cc..143ffa337 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -99,12 +99,14 @@ public interface IMemberBasicInfoService { int updateMemberBalance(UpdateMemberBalanceDTO dto); /** - * + * 根据会员id查询会员信息，不传merchantId查不到具体余额 * @param memberId * @return */ MemberVO queryMemberInfoByMemberId(String memberId); + MemberVO queryMemberInfoByMemberId(String memberId, String merchantId); + /** * 查询会员基本信息列表（后管用） * @param dto 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 fbbf01909..932f6c4eb 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 @@ -311,6 +311,11 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { @Override public MemberVO queryMemberInfoByMemberId(String memberId) { + return queryMemberInfoByMemberId(memberId, null); + } + + @Override + public MemberVO queryMemberInfoByMemberId(String memberId, String merchantId) { if (StringUtils.isBlank(memberId)) { return null; } @@ -319,7 +324,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { if (vo == null) { return null; } - vo.setTotalAccountAmount(vo.getPrincipalBalance()); + + BigDecimal totalAccountAmount = BigDecimal.ZERO; + if (StringUtils.isNotBlank(merchantId)) { + MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(memberId, merchantId); + if (memberWalletInfo != null) { + totalAccountAmount = memberWalletInfo.getPrincipalBalance(); + } + } + vo.setTotalAccountAmount(totalAccountAmount); // 查询用户车牌号 MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();