From e8df19e3efe5a5cda98997ea2b20c039990a0ab8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 16:48:12 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index cd82db8..ba0fb10 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.mall.mapper.MallMemberPaymentMapper;
import cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,8 @@
private final MallMoneyFlowMapper mallMoneyFlowMapper;
private final MallMemberPaymentMapper mallMemberPaymentMapper;
+
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -100,8 +103,11 @@
if(ObjectUtil.isEmpty(mallMoneyFlow)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
+ if(1 != mallMoneyFlow.getStatus()){
+ return new FebsResponse().fail().message("当前状态不是提现中");
+ }
mallMoneyFlow.setStatus(2);
- mallMoneyFlowMapper.insert(mallMoneyFlow);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
return new FebsResponse().success();
}
@@ -112,15 +118,25 @@
if(ObjectUtil.isEmpty(mallMoneyFlow)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
+ if(1 != mallMoneyFlow.getStatus()){
+ return new FebsResponse().fail().message("当前状态不是提现中");
+ }
mallMoneyFlow.setStatus(3);
- mallMoneyFlowMapper.insert(mallMoneyFlow);
+ mallMoneyFlowMapper.updateById(mallMoneyFlow);
+
+ //用户钱包增加对应的余额
+ iApiMallMemberWalletService.addBalance(mallMoneyFlow.getAmount().negate(),mallMoneyFlow.getMemberId());
return new FebsResponse().success();
}
@Override
public AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id) {
+ AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- AdminMallMemberPaymentVo adminMallMemberPaymentVo = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
+ AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
+ if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
+ adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
+ }
return adminMallMemberPaymentVo;
}
--
Gitblit v1.9.1