From 44ba356bc3b58e62ad02105a2e8f3612649df10a Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 12 Jul 2024 17:05:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/MemberWalletInfoServiceImpl.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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