From 29cbc3a839a4d242eff4127e4cd95434e306846b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 22 四月 2025 10:16:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 2c0dfaa..d342ddf 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
@@ -72,6 +72,7 @@
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("余额不足");
}
@@ -186,6 +187,22 @@
franchiseeWithdraw.setHandle(byId.getNickName());
franchiseeWithdraw.setUpdateTime(new Date());
franchiseeWithdrawService.updateById(franchiseeWithdraw);
+ Franchisee franchisee = franchiseeService.getById(byId.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