From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
index d7d34dc..87fe1bf 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java
@@ -304,10 +304,19 @@
);
if(CollUtil.isNotEmpty(mallMoneyFlows)){
BigDecimal reduce = mallMoneyFlows.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
- if(reduce.intValue() >= realScore){
- apiRunHealthVo.setScoreUsed(reduce.intValue() - realScore);
- apiRunHealthVo.setScoreTotal(reduce.intValue());
- }
+ apiRunHealthVo.setScoreTotal(reduce.intValue());
+ }
+ List<MallMoneyFlow> mallMoneyFlowScoreOuts = mallMoneyFlowMapper.selectList(
+ new LambdaQueryWrapper<MallMoneyFlow>()
+ .eq(MallMoneyFlow::getMemberId, memberId)
+ .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.SCORE.getValue())
+ .eq(MallMoneyFlow::getType, RunVipMoneyFlowTypeEnum.SCORE_OUT_BALANCE.getValue())
+ .ge(MallMoneyFlow::getCreatedTime, DateUtil.beginOfDay(DateUtil.date()))
+ .le(MallMoneyFlow::getCreatedTime, DateUtil.endOfDay(DateUtil.date()))
+ );
+ if(CollUtil.isNotEmpty(mallMoneyFlowScoreOuts)){
+ BigDecimal reduce = mallMoneyFlowScoreOuts.stream().map(MallMoneyFlow::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).abs();
+ apiRunHealthVo.setScoreUsed(reduce.intValue());
}
return apiRunHealthVo;
}
--
Gitblit v1.9.1