From e8044ee933b7e2f834855f28ea8575d82eb0eeac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 20 六月 2025 21:25:13 +0800
Subject: [PATCH] 提现管理
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 78e8867..107073f 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -23,10 +23,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 分公司管理控制器
@@ -148,6 +145,11 @@
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
model.addAttribute("scopeList",scopeList);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
+
return PREFIX + "tCompany_detail.html";
}
@@ -171,6 +173,10 @@
//经营区域
List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
model.addAttribute("scopeList",scopeList);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
return PREFIX + "tCompany_edit.html";
}
@@ -195,6 +201,10 @@
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
model.addAttribute("user",user);
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
return PREFIX + "tCompany_detailFranchisee.html";
}
@@ -221,6 +231,11 @@
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
model.addAttribute("user",user);
+
+ //计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompanyId)
+ .eq("type", 2).last("LIMIT 1"));
+ model.addAttribute("contentExclusive",JSONObject.parseObject(tSystemPrice.getContent()));
return PREFIX + "tCompany_updateFranchisee.html";
}
@@ -294,7 +309,7 @@
*/
@RequestMapping(value = "/add")
@ResponseBody
- public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
+ public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password,String content) {
//判断账号是否已存在
int count = userService.selectCount(new EntityWrapper<User>().eq("account", account)
.eq("status",1));
@@ -320,6 +335,14 @@
user.setName(tCompany.getName());
user.setSex(1);
userService.insert(user);
+
+ // 添加计费规则
+ TSystemPrice tSystemPrice = new TSystemPrice();
+ tSystemPrice.setCompanyId(tCompany.getId());
+ tSystemPrice.setType(2);
+ tSystemPrice.setState(1);
+ tSystemPrice.setContent(content);
+ systemPriceService.insert(tSystemPrice);
//添加经营区域
addSocpe(subArr,tCompany.getId());
@@ -355,7 +378,7 @@
*/
@RequestMapping(value = "/addFranchisee")
@ResponseBody
- public Object addFranchisee(TCompany tCompany,String account,String password) {
+ public Object addFranchisee(TCompany tCompany,String account,String password,String content) {
//判断账号是否已存在
int count = userService.selectCount(
new EntityWrapper<User>().eq("account", account)
@@ -385,6 +408,14 @@
user.setName(tCompany.getName());
user.setSex(1);
userService.insert(user);
+
+ // 添加计费规则
+ TSystemPrice tSystemPrice = new TSystemPrice();
+ tSystemPrice.setCompanyId(tCompany.getId());
+ tSystemPrice.setType(2);
+ tSystemPrice.setState(1);
+ tSystemPrice.setContent(content);
+ systemPriceService.insert(tSystemPrice);
return SUCCESS_TIP;
}
@@ -417,7 +448,7 @@
*/
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
+ public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId,String content) {
//判断账号
User user = userService.selectById(userId);
if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
@@ -436,6 +467,15 @@
tCompanyService.updateById(tCompany);
user.setName(tCompany.getName());
userService.updateById(user);
+
+ // 修改计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompany.getId())
+ .eq("type", 2)
+ .last("LIMIT 1"));
+ if (Objects.nonNull(tSystemPrice)){
+ tSystemPrice.setContent(content);
+ systemPriceService.updateById(tSystemPrice);
+ }
//添加经营区域
addSocpe(subArr,tCompany.getId());
@@ -462,7 +502,7 @@
*/
@RequestMapping(value = "/updateFranchisee")
@ResponseBody
- public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
+ public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId,String content) {
//判断账号
User user = userService.selectById(userId);
if (!user.getAccount().equals(account)){
@@ -481,6 +521,15 @@
user.setName(tCompany.getName());
userService.updateById(user);
+ // 修改计费规则
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("companyId", tCompany.getId())
+ .eq("type", 2)
+ .last("LIMIT 1"));
+ if (Objects.nonNull(tSystemPrice)){
+ tSystemPrice.setContent(content);
+ systemPriceService.updateById(tSystemPrice);
+ }
+
return SUCCESS_TIP;
}
--
Gitblit v1.7.1