From 6fdfbf4708f7f7a71b4d63b9adacc56a25161168 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 17:58:16 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 449fbd4..6bd1809 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
@@ -58,6 +58,7 @@
private final IApiMallMemberWalletService iApiMallMemberWalletService;
private final AppVersionMapper appVersionMapper;
+ private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final MallNewsInfoMapper mallNewsInfoMapper;
private final MallShopApplyMapper mallShopApplyMapper;
@@ -143,28 +144,44 @@
@Override
@Transactional
public FebsResponse chargeAgree(Long id) {
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallMoneyFlow)){
+
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
- if(1 != mallMoneyFlow.getStatus()){
+ if(1 != mallMemberWithdraw.getStatus()){
return new FebsResponse().fail().message("当前状态不是提现中");
}
+ mallMemberWithdraw.setStatus(2);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+
+ QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
mallMoneyFlow.setStatus(2);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
+
return new FebsResponse().success();
}
@Override
@Transactional
public FebsResponse chargeDisagree(Long id) {
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallMoneyFlow)){
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallMemberWithdraw)){
return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
}
- if(1 != mallMoneyFlow.getStatus()){
+ if(1 != mallMemberWithdraw.getStatus()){
return new FebsResponse().fail().message("当前状态不是提现中");
}
+ mallMemberWithdraw.setStatus(3);
+ mallMemberWithdrawMapper.updateById(mallMemberWithdraw);
+
+ QueryWrapper<MallMoneyFlow> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("order_no",mallMemberWithdraw.getWithdrawNo());
+ objectQueryWrapper.eq("type",MoneyFlowTypeEnum.WITHDRAWAL.getValue());
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOne(objectQueryWrapper);
mallMoneyFlow.setStatus(3);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
@@ -176,8 +193,8 @@
@Override
public AdminMallMemberPaymentVo getMallMemberPaymentInfoByFlowId(long id) {
AdminMallMemberPaymentVo adminMallMemberPaymentVo = new AdminMallMemberPaymentVo();
- MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectById(id);
- AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMoneyFlow.getMemberId());
+ MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectById(id);
+ AdminMallMemberPaymentVo adminMallMemberPaymentVoa = mallMemberPaymentMapper.getMallMemberPaymentInfoByMemberId(mallMemberWithdraw.getMemberId());
if(ObjectUtil.isNotEmpty(adminMallMemberPaymentVoa)){
adminMallMemberPaymentVo = adminMallMemberPaymentVoa;
}
@@ -358,7 +375,11 @@
}
if (isReduce) {
- iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
+ int i = iApiMallMemberWalletService.reduce(mallSystemPayDto.getAddBalance().negate(), mallSystemPayDto.getId(), filedType);
+
+ if (i == 2) {
+ throw new FebsException("剩余数量不足");
+ }
} else {
iApiMallMemberWalletService.add(mallSystemPayDto.getAddBalance(), mallSystemPayDto.getId(), filedType);
}
@@ -449,6 +470,10 @@
throw new FebsException("申请已审核, 请勿重复操作");
}
+ MallMember member = mallMemberMapper.selectById(apply.getMemberId());
+ member.setStoreMaster(1);
+ mallMemberMapper.updateById(member);
+
apply.setStatus(MallShopApply.APPLY_AGREE);
mallShopApplyMapper.updateById(apply);
}
--
Gitblit v1.9.1