From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 206 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 173 insertions(+), 33 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index e60548d..9092db9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -10,6 +10,7 @@
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -22,6 +23,7 @@
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import io.swagger.models.auth.In;
import org.apache.poi.ss.formula.functions.T;
+import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -78,6 +80,11 @@
@Autowired
private TOperatorService tOperatorService;
+ @Autowired
+ private ITSiteService siteService;
+ @Autowired
+ private IUserService userService;
+
/**
* 跳转到车辆管理首页
@@ -96,12 +103,26 @@
*/
@RequestMapping("/tShop_add")
public String tCompetitionAdd(Model model) {
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
+
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
List<TOperator> list1 = tOperatorService.list();
-
+ 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);
+ }
// if (!roleid.equals("1")){
TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
@@ -113,8 +134,56 @@
// }
model.addAttribute("yysList",list1);
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
return PREFIX + "TShop_add.html";
}
+ // 运营商根据省筛选市区
+ @RequestMapping("/getProvinceYys")
+ @ResponseBody
+ public Object getProvinceYys(Integer operatorId) {
+ // 获取运营商管理的所有省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", operatorId)
+ .eq("pid", 0));
+
+ return list;
+ }
+ // 运营商根据省筛选市区
+ @RequestMapping("/getCityYys")
+ @ResponseBody
+ public Object getCityYys(String province,Integer operatorId) {
+
+ // 通过选择的省 获取管理的市
+ TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
+ .eq("code",province).eq("operatorId",operatorId));
+ // 如果为null 则说明管理的全国
+ if (byId == null){
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id",code.getId()));
+ }else{
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
+ .eq("operatorId", operatorId)
+ .eq("pid",byId.getId()));
+ if (list.size() == 0){
+ // 说明管理整个省
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
+ // 获取省下面的所有市
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId()));
+ }else{
+ // 没有管理整个省 获取对应的市
+ return list;
+ }
+ }
+ }
+ // 运营商赛事添加 根据所选市 获取门店
+ @RequestMapping("/getStoresYys")
+ @ResponseBody
+ public Object getStoresYys(String cityCode) {
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<TStore> stores = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)
+ .eq("cityCode", cityCode));
+ return stores;
+ }
+
@RequestMapping("/tShop_add_one")
public String tCompetitionAddOne(Integer id,Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
@@ -153,12 +222,13 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
// TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
- List<TOperatorCity> one = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
- List<TOperatorCity> ones = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
+ List<TOperatorCity> ones = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>()
+ .eq(TOperatorCity::getOperatorId, byId.getOperatorId())
+ .eq(TOperatorCity::getPid, 0));
if(ones.size()>0){
model.addAttribute("list",ones);
- TOperatorCity one1 = operatorCityService.getOne(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1).eq(TOperatorCity::getCode,byId.getProvinceCode()));
+ TOperatorCity one1 = operatorCityService.getOne(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getPid, 0).eq(TOperatorCity::getCode,byId.getProvinceCode()));
List<TOperatorCity> list3 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().in(TOperatorCity::getPid, one1.getId()).eq(TOperatorCity::getType, 2));
model.addAttribute("list1",list3);
System.out.println("===list3======="+list3);
@@ -187,6 +257,20 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
+ // 如果当前登陆人是运营商
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id1.getType()==1){
+ // 全国
+ List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list3);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list4 = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list4);
+ }
+ }
return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_update1/{id}")
@@ -290,7 +374,15 @@
@ResponseBody
public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
- List<TStoreListVo> list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ String roleid = UserExt.getUser().getRoleid();
+ List<TStoreListVo> list =new ArrayList<>();
+ if("3".equals(roleid)){
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }else {
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }
page.setRecords(list);
return super.packForBT(page);
}
@@ -328,24 +420,25 @@
if(yyId==null || type==1){
yyId=0;
}
-
if(yyId!=0) {
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("code",tStore.getProvinceCode())
+ .eq("operatorId",yyId));
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
if (list.size() > 0) {
- TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TOperatorCity byId1 = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("code",tStore.getCityCode())
+ .eq("operatorId",yyId));
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
} else {
TCity byId1 = cityService.getById(tStore.getCityCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -361,16 +454,25 @@
}else {
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, pCode1));
- tStore.setProvince(one.getName());
- tStore.setProvinceCode(one.getCode());
+ if (one !=null){
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ }
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cCode1));
- tStore.setCity(one1.getName());
- tStore.setCityCode(one1.getCode());
+ if (one1 !=null){
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
tStore.setIds(ids);
- tStore.setType(type);
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setType(2);
+ }else{
+ tStore.setType(type);
+ }
+
tStore.setOperatorId(yyId);
tStore.setState(1);
tStore.setCreateTime(new Date());
@@ -381,18 +483,39 @@
}
user.setAccount(userPhone);
user.setName(userName);
- user.setRoleid("2");
+ user.setRoleid("3");
user.setPhone(userPhone);
user.setPassword(SecureUtil.md5("a123456"));
+ user.setObjectType(3);
+ user.setStatus(1);
userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
-
+ if (yyId == null || yyId == 0){
+ tStore.setOperatorId(0);
+ }else{
+ tStore.setOperatorId(yyId);
+ }
storeService.save(tStore);
+ user.setObjectId(tStore.getId());
+ userService.updateById(user);
+ // 添加场地
+ TSite tSite = new TSite();
+ tSite.setName(tStore.getName());
+ tSite.setStoreId(tStore.getId());
+ tSite.setSign(1);
+ siteService.save(tSite);
+
+ HashMap<String, String> mapSite = new HashMap<>();
+ mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ mapSite.put("name",tStore.getName());
+ mapSite.put("space_id",tStore.getId().toString());
+ mapSite.put("area_id",tSite.getId().toString());
+ HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
@@ -431,7 +554,7 @@
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("space_id",tStore.getId()+"");
map.put("device_id",s);
- map.put("region_id","");
+ map.put("region_id",tSite.getId().toString());
// 添加门禁
String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
System.out.println(s1);
@@ -462,18 +585,21 @@
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("operatorId", yyId)
+ .eq("code", tStore.getProvinceCode()));
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
- List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>()
+ .eq(TOperatorCity::getPid, byId.getId()).ne(TOperatorCity::getPid, 0));
if (list.size() > 0) {
- TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TOperatorCity byId1 = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("operatorId", yyId)
+ .eq("code", tStore.getCityCode()));
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
} else {
- TCity byId1 = cityService.getById(tStore.getCityCode());
+ TCity byId1 = cityService.getOne(new QueryWrapper<TCity>().eq("code",tStore.getCityCode()));
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
@@ -489,10 +615,10 @@
}
}else {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -515,10 +641,12 @@
userMapper.updateById(user);
tStore.setLon(lon);
tStore.setLat(lat);
+ // 运营商编辑
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setOperatorId(null);
+ }
storeService.updateById(tStore);
String ids1 = byIdc.getIds();
-
-
HashMap<String, String> mapx = new HashMap<>();
mapx.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -733,9 +861,15 @@
@ResponseBody
public Object freeze(Integer id) {
try {
- TStore byId = storeService.getById(id);
- byId.setState(2);
- storeService.updateById(byId);
+ // 查询门店 获取门店店长id
+ TStore store = storeService.getById(id);
+ // 冻结
+ store.setState(2);
+ storeService.updateById(store);
+ Integer storeStaffId = store.getStoreStaffId();
+ User user = userService.getById(storeStaffId);
+ user.setStatus(2);
+ userService.updateById(user);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -746,9 +880,15 @@
@ResponseBody
public Object unfreeze(Integer id) {
try {
- TStore byId = storeService.getById(id);
- byId.setState(1);
- storeService.updateById(byId);
+ // 查询门店 获取门店店长id
+ TStore store = storeService.getById(id);
+ // 解冻
+ store.setState(1);
+ storeService.updateById(store);
+ Integer storeStaffId = store.getStoreStaffId();
+ User user = userService.getById(storeStaffId);
+ user.setStatus(1);
+ userService.updateById(user);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1