From 59d239c8e4058a45bc03bf8ebdd90b84bbbd11ea Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 27 Nov 2023 15:18:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86VIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/MemberBasicInfoServiceImpl.java | 8 +++++++- .../main/resources/mapper/pile/MemberBasicInfoMapper.xml | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 b848a30f5..6ef40c302 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 @@ -534,7 +534,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { List merchantIdList = merchantInfoVOList.stream() .map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); List resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto); - + if (CollectionUtils.isNotEmpty(resultList)) { + for (MerchantVipVO merchantVipVO : resultList) { + BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance(); + BigDecimal giftBalance = merchantVipVO.getGiftBalance() == null ? BigDecimal.ZERO : merchantVipVO.getGiftBalance(); + merchantVipVO.setTotalAccountAmount(principalBalance.add(giftBalance)); + } + } return resultList; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index b220c42bf..b7aafbd4a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -263,7 +263,8 @@ t2.nick_name as nickName, t2.avatar_url as avatarUrl, t1.wallet_code as walletCode, - t1.principal_balance as principalBalance + t1.principal_balance as principalBalance, + t1.gift_balance as giftBalance from member_wallet_info t1 JOIN member_basic_info t2 on t2.member_id = t1.member_id and t2.del_flag = '0' JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'