diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java index 34faa8443..386913244 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java @@ -38,6 +38,8 @@ public interface MemberWalletInfoMapper { */ MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId); + List selectByMemberIdList(@Param("memberId") String memberId, @Param("merchantId") String merchantId); + List selectByMemberWalletList(@Param("memberId") String memberId); MemberWalletInfo selectByWalletCode(@Param("walletCode") String walletCode); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java index 37201480f..4be888a50 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java @@ -46,7 +46,15 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { @Override public MemberWalletInfo selectByMemberId(String memberId, String merchantId) { - return memberWalletInfoMapper.selectByMemberId(memberId, merchantId); + List list = memberWalletInfoMapper.selectByMemberIdList(memberId, merchantId); + if (CollectionUtils.isEmpty(list)) { + return null; + } + // 优先返回 merchantId 不为空的记录,避免脏数据干扰 + return list.stream() + .filter(w -> w.getMerchantId() != null) + .findFirst() + .orElse(list.get(0)); } @Override diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index 352b6a218..8f5cc314b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -528,6 +528,17 @@ + +