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

getMemberBalanceChangesV2接口加字段

Browse Source
This commit is contained in:
Guoqs
2025-01-20 15:26:08 +08:00
parent 06dca3a4e9
commit 7f347f2bae
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -458,11 +458,11 @@ public class MemberService {
// 累计赠送金额 // 累计赠送金额
vo.setAccumulatedRechargeGift(memberWalletVO.getAccumulatedRechargeGift()); vo.setAccumulatedRechargeGift(memberWalletVO.getAccumulatedRechargeGift());
// 累计消费金额 // 累计充值金额
vo.setTotalConsumption(memberWalletVO.getAccumulatedConsumptionAmount()); vo.setAccumulatedRechargeAmount(memberWalletVO.getTotalRechargeAmount());
// 总充值 // 累计消费金额
vo.setTotalRechargeAmount(memberWalletVO.getTotalRechargeAmount()); vo.setAccumulatedConsumptionAmount(memberWalletVO.getAccumulatedConsumptionAmount());
// 根据日期查询会员钱包变动明细 分页 // 根据日期查询会员钱包变动明细 分页
// 获取分页信息 // 获取分页信息
@@ -485,19 +485,19 @@ public class MemberService {
List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetail(dto); List<MemberWalletLogVO> list = memberBasicInfoService.getMemberWalletDetail(dto);
// 总支出 // 总支出
// BigDecimal totalConsumption = list.stream() BigDecimal totalConsumption = list.stream()
// .map(MemberWalletLogVO::getOrderAmount) .map(MemberWalletLogVO::getOrderAmount)
// .filter(Objects::nonNull) .filter(Objects::nonNull)
// .reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
// vo.setTotalConsumption(totalConsumption); vo.setTotalConsumption(totalConsumption);
// 总充值 // 总充值
// BigDecimal totalRechargeAmount = list.stream() BigDecimal totalRechargeAmount = list.stream()
// .filter(x -> StringUtils.equals(x.getType(), "1")) .filter(x -> StringUtils.equals(x.getType(), "1"))
// .filter(x -> StringUtils.equals(x.getSubType(), "10") || StringUtils.equals(x.getSubType(), "11")) .filter(x -> StringUtils.equals(x.getSubType(), "10") || StringUtils.equals(x.getSubType(), "11"))
// .map(MemberWalletLogVO::getAmount) .map(MemberWalletLogVO::getAmount)
// .reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
// vo.setTotalRechargeAmount(totalRechargeAmount); vo.setTotalRechargeAmount(totalRechargeAmount);
// PageInfo<MemberWalletLogVO> pageInfo = new PageInfo<>(list); // PageInfo<MemberWalletLogVO> pageInfo = new PageInfo<>(list);
// 获取 type 和 subType 的对应信息 // 获取 type 和 subType 的对应信息

7
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java
View File

@@ -43,10 +43,15 @@ public class MemberWalletInfoVO {
*/ */
private BigDecimal accumulatedRechargeGift; private BigDecimal accumulatedRechargeGift;
/**
* 累计充值金额(累计充值本金+累计赠送金额)
*/
private BigDecimal accumulatedRechargeAmount;
/** /**
* 累计消费 * 累计消费
*/ */
// private BigDecimal accumulatedConsumptionAmount; private BigDecimal accumulatedConsumptionAmount;
/** /**
* 总充值金额 * 总充值金额