From b716afd262ff60ff1db0b1e7c95800e7ad2b7202 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 07 七月 2025 11:07:37 +0800
Subject: [PATCH] 支付版本更新 根据资金流向使用V2或V3服务商版本支付
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 60 +++++++++++++++++++-----------------------------------------
1 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index b54e8ac..5622203 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -116,29 +116,10 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
model.addAttribute("userType",objectType);
- List<CityManager> province = cityManagerClient.listAll();
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
- }
- HashSet<String> set = new HashSet<String>(list1);
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
-
List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
-
-
-
-
-
-
-
model.addAttribute("list",list3);
model.addAttribute("siteType",siteType);
String roleid = UserExt.getUser().getRoleid();
@@ -146,12 +127,8 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("type",1);
-
-
List<TOperator> list5 = tOperatorService.list();
-
model.addAttribute("list5",list5);
-
return PREFIX + "TSite.html";
}
/**
@@ -642,12 +619,8 @@
Integer storeId = tSiteDTO.getStoreId();
TStore byId = storeService.getById(storeId);
if (byId!=null){
- if (byId.getType()==1){
+ if (byId.getOperatorId()==null || byId.getOperatorId()==0){
tSiteDTO.setOperator("平台");
- }else{
- TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
- if (byId1!=null)
- tSiteDTO.setOperator(byId1.getName());
}
}
}
@@ -656,21 +629,28 @@
@Autowired
private TOperatorService tOperatorService;
-
+ @Autowired
+ private TOperatorCityService operatorCityService;
/**
* 跳转到添加场地管理
*/
@RequestMapping("/add")
public String tCompetitionAdd(Model model) {
- List<CityManager> province = cityManagerClient.listAll();
- System.out.println(province);
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id.getType()==1){
+ // 全国
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list);
+ }
+ }else{
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
}
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
@@ -687,13 +667,11 @@
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
model.addAttribute("userType",objectType);
- HashSet<String> set = new HashSet<String>(list1);
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
model.addAttribute("siteType",siteType);
- model.addAttribute("province",set);
- model.addAttribute("city",list2);
+ model.addAttribute("province",list);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
--
Gitblit v1.7.1