From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
index e75cd53..030e58b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
@@ -4,13 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.entity.Franchisee;
-import com.ruoyi.admin.entity.FranchiseeWithdraw;
-import com.ruoyi.admin.entity.RecoveryServe;
-import com.ruoyi.admin.entity.TFranchiseeBalanceChange;
+import com.ruoyi.admin.entity.*;
import com.ruoyi.admin.request.AuditFranchiseeWithdrawDTO;
import com.ruoyi.admin.request.FranchiseeWithdrawDTO;
import com.ruoyi.admin.service.FranchiseeService;
+import com.ruoyi.admin.service.SysUserService;
import com.ruoyi.admin.service.TFranchiseeBalanceChangeService;
import com.ruoyi.admin.service.TFranchiseeWithdrawService;
import com.ruoyi.common.core.domain.R;
@@ -58,7 +56,8 @@
@Resource
private TFranchiseeWithdrawService franchiseeWithdrawService;
-
+ @Resource
+ private SysUserService sysUserService;
@PostMapping("/applyWithdraw")
@ApiOperation(value = "APP-加盟商申请提现", tags = {"提现"})
@@ -67,10 +66,13 @@
if (loginUser==null){
return R.fail("登录失效");
}
- Franchisee franchisee = franchiseeService.getById(loginUser.getUserid());
+ SysUser user = sysUserService.getById(loginUser.getUserid());
+
+ Franchisee franchisee = franchiseeService.getById(user.getFranchiseeId());
if (franchisee.getBalance().subtract(dto.getMoney()).compareTo(BigDecimal.ZERO)>=0){
BigDecimal subtract = franchisee.getBalance().subtract(dto.getMoney());
franchisee.setBalance(subtract);
+ franchiseeService.updateById(franchisee);
}else{
return R.fail("余额不足");
}
@@ -108,8 +110,9 @@
if (null == loginWorker) {
return R.loginExpire("登录失效！");
}
+ SysUser user = sysUserService.getById(loginWorker.getUserid());
IPage<FranchiseeWithdraw> franchiseeWithdrawList = franchiseeWithdrawService
- .lambdaQuery().eq(FranchiseeWithdraw::getFranchiseeId, loginWorker.getUserid())
+ .lambdaQuery().eq(FranchiseeWithdraw::getFranchiseeId, user.getFranchiseeId())
.orderByDesc(FranchiseeWithdraw::getCreateTime)
.page(Page.of(pageNum, pageSize));
return R.ok(franchiseeWithdrawList);
@@ -121,8 +124,10 @@
if (null == loginWorker) {
return R.loginExpire("登录失效！");
}
+ SysUser byId = sysUserService.getById(loginWorker.getUserid());
+
LambdaQueryWrapper<FranchiseeWithdraw> franchiseeWithdrawLambdaQueryWrapper = new LambdaQueryWrapper<>();
- franchiseeWithdrawLambdaQueryWrapper.eq(FranchiseeWithdraw::getFranchiseeId, loginWorker.getUserid())
+ franchiseeWithdrawLambdaQueryWrapper
.orderByDesc(FranchiseeWithdraw::getCreateTime);
if (StringUtils.hasLength(franchiseeWithdrawDTO.getFranchiseeName())){
List<Integer> ids = franchiseeService.lambdaQuery().like(Franchisee::getName, franchiseeWithdrawDTO.getFranchiseeName()).list()
@@ -173,13 +178,31 @@
if (null == loginWorker) {
return R.loginExpire("登录失效！");
}
+ SysUser byId = sysUserService.getById(loginWorker.getUserid());
FranchiseeWithdraw franchiseeWithdraw = franchiseeWithdrawService.getById(auditFranchiseeWithdrawDTO.getId());
franchiseeWithdraw.setStatus(auditFranchiseeWithdrawDTO.getStatus());
franchiseeWithdraw.setResult(auditFranchiseeWithdrawDTO.getResult());
franchiseeWithdraw.setImg(auditFranchiseeWithdrawDTO.getImg());
+ franchiseeWithdraw.setUpdateBy(byId.getNickName());
+ franchiseeWithdraw.setHandle(byId.getNickName());
franchiseeWithdraw.setUpdateTime(new Date());
- franchiseeWithdraw.setUpdateBy(loginWorker.getUsername());
franchiseeWithdrawService.updateById(franchiseeWithdraw);
+ Franchisee franchisee = franchiseeService.getById(franchiseeWithdraw.getFranchiseeId());
+ if (auditFranchiseeWithdrawDTO.getStatus()==3){
+ // 回退运营商余额
+ TFranchiseeBalanceChange balanceChange = new TFranchiseeBalanceChange();
+ balanceChange.setAmount(franchiseeWithdraw.getMoney());
+ balanceChange.setIs_pay(1);
+ balanceChange.setFranchiseeName(franchisee.getName());
+ balanceChange.setFranchiseeId(franchisee.getId()+"");
+ balanceChange.setRemark("余额提现回退");
+ balanceChange.setType(4);
+ balanceChange.setIsDelete(0);
+ franchiseeBalanceChangeService.save(balanceChange);
+ BigDecimal add = franchisee.getBalance().add(franchiseeWithdraw.getMoney());
+ franchisee.setBalance(add);
+ franchiseeService.updateById(franchisee);
+ }
return R.ok();
}
}
--
Gitblit v1.7.1