autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-19 14:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 余额支付退款时空指针异常

Browse Source
This commit is contained in:
Lemon
2026-04-21 10:36:55 +08:00
parent b2ec3fb29c
commit f87f2f5176
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
View File

@@ -38,6 +38,8 @@ public interface MemberWalletInfoMapper {
*/
MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
List<MemberWalletInfo> selectByMemberIdList(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
List<MemberWalletInfo> selectByMemberWalletList(@Param("memberId") String memberId);
MemberWalletInfo selectByWalletCode(@Param("walletCode") String walletCode);

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
View File

@@ -46,7 +46,15 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
@Override
public MemberWalletInfo selectByMemberId(String memberId, String merchantId) {
return memberWalletInfoMapper.selectByMemberId(memberId, merchantId);
List<MemberWalletInfo> 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