From 2b3474f7f6ca8ea979adc77b3f4021b6eacb5c18 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 3 Jul 2023 17:23:39 +0800 Subject: [PATCH] update --- .../src/main/java/com/jsowell/service/OrderService.java | 2 +- .../jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java | 3 +-- .../src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 15f858a68..a4d99562f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -386,7 +386,7 @@ public class OrderService { throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT); } BigDecimal principalAmount = memberVO.getPrincipalBalance(); // 会员剩余本金金额 - BigDecimal giftAmount = memberVO.getGiftBalance(); // 会员剩余赠送余额 + // BigDecimal giftAmount = memberVO.getGiftBalance(); // 会员剩余赠送余额 BigDecimal principalPay = null; // 30 BigDecimal giftPay = null; // 10 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 8c0a51691..3e6e9b538 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 @@ -13,7 +13,6 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; -import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -245,7 +244,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { if (vo == null) { return null; } - vo.setTotalAccountAmount(vo.getPrincipalBalance().add(vo.getGiftBalance())); + vo.setTotalAccountAmount(vo.getPrincipalBalance()); // 查询用户车牌号 MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java index 24a874c27..1f105491a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java @@ -47,7 +47,7 @@ public class MemberVO { /** * 赠送金额 */ - private BigDecimal giftBalance; + // private BigDecimal giftBalance; /** * 总账户余额