From 6facfba88bcb0a118fc442ec1375cb233ad7128c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 27 Nov 2023 15:41:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A0=E8=B5=A0=E9=80=81=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MemberBasicInfoServiceImpl.java | 3 ++ .../src/views/member/merchantVIP/index.vue | 33 +++++++------------ 2 files changed, 14 insertions(+), 22 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 6ef40c302..c73187a0b 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 @@ -367,13 +367,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { try { BigDecimal totalAccountAmount = BigDecimal.ZERO; BigDecimal principalBalance = BigDecimal.ZERO; + BigDecimal giftBalance = BigDecimal.ZERO; MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(memberId, merchantId); if (memberWalletInfo != null) { totalAccountAmount = memberWalletInfo.getPrincipalBalance(); principalBalance = memberWalletInfo.getPrincipalBalance(); + giftBalance = memberWalletInfo.getGiftBalance(); } vo.setTotalAccountAmount(totalAccountAmount); vo.setPrincipalBalance(principalBalance); + vo.setGiftBalance(giftBalance); } catch (Exception e) { log.error("查询用户余额异常 memberId:{}, merchantId:{}", memberId, merchantId, e); } diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue index 1ab27598e..9eae413b9 100644 --- a/jsowell-ui/src/views/member/merchantVIP/index.vue +++ b/jsowell-ui/src/views/member/merchantVIP/index.vue @@ -62,9 +62,15 @@ - - + + + - - - - - - - - + + +