From 565547a1d026a9bcff26f3e0edaf079bdb7a55d4 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 08:55:52 +0800
Subject: [PATCH] 10.26
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index bccc7ab..41b066c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -57,6 +57,7 @@
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
@Controller
@RequestMapping("/ball")
@@ -182,6 +183,9 @@
@ResponseBody
public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
+ User user = UserExt.getUser();
+ ballQueryDto.setType(user.getObjectType());
+ ballQueryDto.setId(user.getObjectId());
return ballClient.list(ballQueryDto);
}
@@ -217,8 +221,24 @@
game.setRed(red);
game.setState(0);
game.setBlue(blue);
+
+
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+
+
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ System.out.println("=====byId======="+byId);
+ game.setProvinceCode(byId.getProvinceCode());
+ game.setCityCode(byId.getCityCode());
+
+
+ }else {
game.setProvinceCode(province);
game.setCityCode(city);
+
+ }
game.setSiteId(site);
game.setStoreId(store);
game.setId(id);
@@ -381,13 +401,18 @@
model.addAttribute("is3","true");
model.addAttribute("storeId",UserExt.getUser().getObjectId());
TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ System.out.println("=====byId======="+byId);
model.addAttribute("cityCode",byId.getCityCode());
model.addAttribute("provinceCode",byId.getProvinceCode());
model.addAttribute("oId",byId.getOperatorId());
return PREFIX+"ball_pre_add1.html";
- }else {
- model.addAttribute("is3","false");
+ }
+
+ if (objectType == 2){
+ model.addAttribute("is3","true");
+ model.addAttribute("oId",UserExt.getUser().getObjectId());
+ return PREFIX+"ball_pre_add2.html";
}
@@ -460,6 +485,10 @@
model.addAttribute("provinceCode",byId.getProvinceCode());
model.addAttribute("oId",byId.getOperatorId());
return PREFIX+"ball_pre_edit1.html";
+
+ }
+ if (objectType == 2){
+ return PREFIX+"ball_pre_edit2.html";
}
@@ -852,6 +881,17 @@
@RequestMapping("/yuyuelist")
@ResponseBody
public List<Map<String,Object>> yuyuelist(BookingQuery bookingQuery) {
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if(objectType==2){
+ List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>()
+ .eq("operatorId", UserExt.getUser().getObjectId()))
+ .stream().map(TStore::getId).collect(Collectors.toList());
+ bookingQuery.setStoreIds(operatorId);
+ }
+ if(objectType==3){
+ bookingQuery.setStoreId(UserExt.getUser().getObjectId());
+ }
List<Map<String,Object>> orders = ballClient.listorder(bookingQuery);
System.out.println("=======ballQueryDto=========="+bookingQuery);
@@ -1012,20 +1052,36 @@
String cityCode = null;
if(objectType == 2){//城市管理员
- CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
- cityCode = cityManager.getCityCode();
+ // 获取到这个运营商下面的所有门店
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId",objectId));
+ model.addAttribute("store", operatorId);
+ List<Coach> coach = coachClient.queryCoachByOperatorId(objectId);
+ model.addAttribute("coach", coach);
+ // 如果该运营商下面没有门店
+ if (operatorId.size()==0){
+ List<TStore> o = new ArrayList<>();
+ List<TSite> tSites = new ArrayList<>();
+ model.addAttribute("store", o);
+ model.addAttribute("site", tSites);
+ }else{
+ List<TSite> storeId = siteService.list(new QueryWrapper<TSite>()
+ .eq("storeId", operatorId.get(0).getId()));
+ model.addAttribute("site", storeId);
+ }
+ }else {
+ List<Map<String, Object>> list = storeService.queryProvince(cityCode);
+ model.addAttribute("province", list);
+ Object code = list.get(0).get("code");
+ List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
+ model.addAttribute("city", list1);
+ String code1 = list1.get(0).get("code").toString();
+ List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
+ model.addAttribute("store", list2);
+ TStore store = list2.get(0);
+ List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
+ model.addAttribute("site", list3);
}
- List<Map<String, Object>> list = storeService.queryProvince(cityCode);
- model.addAttribute("province", list);
- Object code = list.get(0).get("code");
- List<Map<String, Object>> list1 = storeService.queryCity(code.toString(), cityCode);
- model.addAttribute("city", list1);
- String code1 = list1.get(0).get("code").toString();
- List<TStore> list2 = storeService.list(new QueryWrapper<TStore>().eq("cityCode", code1).eq("state", 1));
- model.addAttribute("store", list2);
- TStore store = list2.get(0);
- List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));
- model.addAttribute("site", list3);
+ model.addAttribute("objectType",objectType);
return PREFIX+"yuyue_add.html";
}
@@ -1037,10 +1093,16 @@
siteBooking.setInsertTime(new Date());
siteBooking.setState(1);
siteBooking.setStatus(0);
-
- siteClient.addSiteBooking(siteBooking);
+ // 如果是运营商添加的话 根据门店的省市来存储
+ if (UserExt.getUser().getObjectType() == 2){
+ TStore byId = storeService.getById(siteBooking.getStoreId());
+ siteBooking.setProvince(byId.getProvince());
+ siteBooking.setProvinceCode(byId.getProvinceCode());
+ siteBooking.setCity(byId.getCity());
+ siteBooking.setCityCode(byId.getCityCode());
+ }
+ siteClient.addSiteBooking(siteBooking);
System.out.println("================="+siteBooking);
-
return new ResultUtil<>(null,200,null,null,null);
}
--
Gitblit v1.7.1