diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 4464bd6ff..d60e7f59e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -338,8 +338,14 @@ public class MemberService { // 用户未注册小程序 throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR); } + // 本金 + BigDecimal principalBalance = memberWalletVO.getPrincipalBalance(); + vo.setPrincipalBalance(principalBalance); + // 赠金 + BigDecimal giftBalance = memberWalletVO.getGiftBalance(); + vo.setGiftBalance(giftBalance); // 当前余额 - vo.setCurrentBalance(memberWalletVO.getPrincipalBalance().add(memberWalletVO.getGiftBalance())); + vo.setCurrentBalance(principalBalance.add(giftBalance)); // 累计充值金额 vo.setAccumulatedRechargeAmount(memberWalletVO.getAccumulatedRechargeAmount()); // 累计赠送金额 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java index 748bf7a25..63b6f1e9b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java @@ -23,6 +23,16 @@ public class MemberWalletInfoVO { */ private BigDecimal currentBalance; + /** + * 本金金额 + */ + private BigDecimal principalBalance; + + /** + * 赠送金余额 + */ + private BigDecimal giftBalance; + /** * 累计充值 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index c0fab086f..7b70c836a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -203,13 +203,13 @@