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 @@
-
-
+
+
+
+
+
+
@@ -72,27 +78,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+