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 | 88 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 25 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 a572c82..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
@@ -82,6 +82,8 @@
@Autowired
private ITSiteService siteService;
+ @Autowired
+ private IUserService userService;
/**
@@ -135,23 +137,31 @@
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 objectId = UserExt.getUser().getObjectId();
+ public Object getCityYys(String province,Integer operatorId) {
// 通过选择的省 获取管理的市
TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
- .eq("code",province).eq("operatorId",objectId));
+ .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", UserExt.getUser().getObjectId())
+ .eq("operatorId", operatorId)
.eq("pid",byId.getId()));
if (list.size() == 0){
// 说明管理整个省
@@ -163,6 +173,15 @@
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")
@@ -203,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);
@@ -250,9 +270,6 @@
List<TOperatorCity> list4 = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
model.addAttribute("list",list4);
}
- }else{
- List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list5);
}
return PREFIX + "TShop_edit.html";
}
@@ -407,19 +424,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("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());
}
@@ -473,10 +492,14 @@
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
- tStore.setOperatorId(UserExt.getUser().getObjectId());
+ if (yyId == null || yyId == 0){
+ tStore.setOperatorId(0);
+ }else{
+ tStore.setOperatorId(yyId);
+ }
storeService.save(tStore);
user.setObjectId(tStore.getId());
-
+ userService.updateById(user);
@@ -562,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());
@@ -835,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();
@@ -848,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