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();