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 5a674f740..7cc2fb321 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -337,16 +337,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); + // 本金 sql处理为空返回0 + vo.setPrincipalBalance(memberWalletVO.getPrincipalBalance()); + // 赠金 sql处理为空返回0 + vo.setGiftBalance(memberWalletVO.getGiftBalance()); // 当前余额 - vo.setCurrentBalance(principalBalance.add(giftBalance)); - // 累计充值金额 - vo.setAccumulatedRechargeAmount(memberWalletVO.getAccumulatedRechargeAmount()); + vo.setCurrentBalance(vo.getPrincipalBalance().add(vo.getGiftBalance())); + // 累计充值本金 + vo.setAccumulatedRechargePrincipal(memberWalletVO.getAccumulatedRechargePrincipal()); // 累计赠送金额 vo.setAccumulatedRechargeGift(memberWalletVO.getAccumulatedRechargeGift()); // 累计消费金额 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 fd147ac53..da76ff92a 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 @@ -95,12 +95,15 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService { @Override public MemberWalletVO selectMemberWalletInfo(String walletCode) { MemberWalletVO memberWalletVO = memberWalletInfoMapper.selectMemberWalletInfo(walletCode); + // 总充值金额 = 累计本金充值 + 累计赠送金额 + memberWalletVO.setTotalRechargeAmount(memberWalletVO.getAccumulatedRechargePrincipal().add(memberWalletVO.getAccumulatedRechargeGift())); + // 累计消费金额 = 累计充值 + 累计赠送 - 本金余额 - 赠送金余额 - BigDecimal accumulatedConsumptionAmount = memberWalletVO.getAccumulatedRechargeAmount() - .add(memberWalletVO.getAccumulatedRechargeGift()) + BigDecimal accumulatedConsumptionAmount = memberWalletVO.getTotalRechargeAmount() .subtract(memberWalletVO.getPrincipalBalance()) .subtract(memberWalletVO.getGiftBalance()); memberWalletVO.setAccumulatedConsumptionAmount(accumulatedConsumptionAmount); + return memberWalletVO; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java index 7a739e9c7..f5b5dd008 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberWalletVO.java @@ -46,13 +46,18 @@ public class MemberWalletVO { /** * 累计本金充值 */ - private BigDecimal accumulatedRechargeAmount; + private BigDecimal accumulatedRechargePrincipal; /** * 累计赠送金额 */ private BigDecimal accumulatedRechargeGift; + /** + * 总充值金额 = 累计本金充值 + 累计赠送金额 + */ + private BigDecimal totalRechargeAmount; + /** * 累计消费 */ 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 63b6f1e9b..fdb85a201 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 @@ -34,9 +34,9 @@ public class MemberWalletInfoVO { private BigDecimal giftBalance; /** - * 累计充值 + * 累计充值本金 */ - private BigDecimal accumulatedRechargeAmount; + private BigDecimal accumulatedRechargePrincipal; /** * 累计赠送金额 diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml index 4766111ba..374a621dd 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletInfoMapper.xml @@ -203,15 +203,15 @@