From ac6547d957ff1c75eba12f8b804d586ce85e4860 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 14:05:16 +0800
Subject: [PATCH] fix(mall): 修复管理员禁用用户功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
index a5674b7..54cff7b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminRunVipServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.RunVipMoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.YesOrNoEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.mall.entity.MallCharge;
@@ -13,6 +14,7 @@
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.mapper.RunVipMapper;
import cc.mrbird.febs.mall.service.IAdminRunVipService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,17 +26,21 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
@Slf4j
@Service
@RequiredArgsConstructor
@Transactional
public class AdminRunVipServiceImpl extends ServiceImpl<RunVipMapper, RunVip> implements IAdminRunVipService {
- private final RunVipMapper runVipMapper;
private final MallChargeMapper mallChargeMapper;
private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final AgentProducer agentProducer;
+ private final IApiMallMemberWalletService walletService;
@Override
public IPage<RunVip> runVipListInPage(RunVip runVip,QueryRequest request) {
Page<RunVip> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -104,6 +110,10 @@
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(new LambdaQueryWrapper<MallMoneyFlow>().eq(MallMoneyFlow::getOrderNo, mallMemberWithdraw.getWithdrawNo()));
mallMoneyFlow.setStatus(mallMemberWithdraw.getStatus());
mallMoneyFlowMapper.updateById(mallMoneyFlow);
+ if(mallMemberWithdraw.getStatus() == YesOrNoEnum.NO.getValue()){
+ BigDecimal add = mallMemberWithdraw.getAmount().add(mallMemberWithdraw.getAmountFee());
+ walletService.addBalance(add, mallMemberWithdraw.getMemberId());
+ }
return new FebsResponse().success().message("操作成功");
}
@@ -113,4 +123,19 @@
IPage<MallMemberWithdraw> adminChargeListVoIPage = mallChargeMapper.selectAdminWithdrawListInPage(page, mallMemberWithdraw);
return adminChargeListVoIPage;
}
+
+ @Override
+ public List<MallMoneyFlow> allMoneyType() {
+ List<MallMoneyFlow> mallMoneyFlows = new ArrayList<>();
+ RunVipMoneyFlowTypeEnum[] values = RunVipMoneyFlowTypeEnum.values();
+ for (RunVipMoneyFlowTypeEnum value : values) {
+ MallMoneyFlow mallMoneyFlow = new MallMoneyFlow();
+ mallMoneyFlow.setType(value.getValue());
+ mallMoneyFlow.setDescription(value.getDescription());
+ mallMoneyFlow.setRemark(value.getTypeDec());
+ mallMoneyFlows.add(mallMoneyFlow);
+ }
+
+ return mallMoneyFlows;
+ }
}
--
Gitblit v1.9.1