autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-09 00:18:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-03 17:23:39 +08:00
parent 19df6f2666
commit 2b3474f7f6
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -386,7 +386,7 @@ public class OrderService {
throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT); throw new BusinessException(ReturnCodeEnum.CODE_BALANCE_IS_INSUFFICIENT);
} }
BigDecimal principalAmount = memberVO.getPrincipalBalance(); // 会员剩余本金金额 BigDecimal principalAmount = memberVO.getPrincipalBalance(); // 会员剩余本金金额
BigDecimal giftAmount = memberVO.getGiftBalance(); // 会员剩余赠送余额 // BigDecimal giftAmount = memberVO.getGiftBalance(); // 会员剩余赠送余额
BigDecimal principalPay = null; // 30 BigDecimal principalPay = null; // 30
BigDecimal giftPay = null; // 10 BigDecimal giftPay = null; // 10

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -13,7 +13,6 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper;
import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper;
import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IPileBasicInfoService; 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.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
@@ -245,7 +244,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
if (vo == null) { if (vo == null) {
return null; return null;
} }
vo.setTotalAccountAmount(vo.getPrincipalBalance().add(vo.getGiftBalance())); vo.setTotalAccountAmount(vo.getPrincipalBalance());
// 查询用户车牌号 // 查询用户车牌号
MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();

2
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java
View File

@@ -47,7 +47,7 @@ public class MemberVO {
/** /**
* 赠送金额 * 赠送金额
*/ */
private BigDecimal giftBalance; // private BigDecimal giftBalance;
/** /**
* 总账户余额 * 总账户余额