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 883cc48af..b3f8debf7 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
@@ -70,11 +70,19 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
         List<MemberWalletInfo> list = memberWalletInfoMapper.selectByMemberWalletList(memberId);
         if (CollectionUtils.isNotEmpty(list)) {
             for (MemberWalletInfo memberWalletInfo : list) {
+                BigDecimal principalBalance = memberWalletInfo.getPrincipalBalance() == null
+                        ? BigDecimal.ZERO
+                        : memberWalletInfo.getPrincipalBalance();
+                BigDecimal giftBalance = memberWalletInfo.getGiftBalance() == null
+                        ? BigDecimal.ZERO
+                        : memberWalletInfo.getGiftBalance();
                 MemberWalletVO memberWalletVO = MemberWalletVO.builder()
                         .memberId(memberWalletInfo.getMemberId())
                         .merchantId(memberWalletInfo.getMerchantId())
                         .walletCode(memberWalletInfo.getWalletCode())
-                        .principalBalance(memberWalletInfo.getPrincipalBalance())
+                        .principalBalance(principalBalance)
+                        .giftBalance(giftBalance)
+                        .totalBalance(principalBalance.add(giftBalance))
                         .build();
                 // 获取运营商名称
                 PileMerchantInfo merchantInfo = pileMerchantInfoService.selectPileMerchantInfoById(memberWalletInfo.getMerchantId());