From dfe52245f20a8177a0db0bc2841909fb3eab0f13 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 08 十一月 2023 09:07:05 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 151 +++++++++++++++++++++++++++----------------------
1 files changed, 83 insertions(+), 68 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 7151c2c..41196c7 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
@@ -135,23 +135,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){
// 说明管理整个省
@@ -212,12 +220,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);
@@ -259,9 +268,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";
}
@@ -416,19 +422,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());
}
@@ -482,7 +490,11 @@
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());
@@ -490,61 +502,61 @@
// 添加场地
- 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++) {
- StoreConfig storeConfig = new StoreConfig();
- storeConfig.setIsOpen(1);
- storeConfig.setSort(i);
- storeConfig.setType(i);
- storeConfig.setStoreId(tStore.getId());
- storeConfigs.add(storeConfig);
- }
- storeConfigService.saveBatch(storeConfigs);
+// 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++) {
+// StoreConfig storeConfig = new StoreConfig();
+// storeConfig.setIsOpen(1);
+// storeConfig.setSort(i);
+// storeConfig.setType(i);
+// storeConfig.setStoreId(tStore.getId());
+// storeConfigs.add(storeConfig);
+// }
+// storeConfigService.saveBatch(storeConfigs);
- // 添加门店
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("name",tStore.getName());
- map1.put("short_name",tStore.getName());
- map1.put("location",tStore.getCity());
- map1.put("address",tStore.getAddress());
- map1.put("telephone",tStore.getPhone());
- map1.put("linkman",userName);
- map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
- map1.put("logo",tStore.getCoverDrawing());
- map1.put("remark",tStore.getIntroduce());
- map1.put("lat",tStore.getLat());
- map1.put("lng",tStore.getLon());
- map1.put("space_id",tStore.getId().toString());
- String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
- System.out.println(result);
+// // 添加门店
+// HashMap<String, String> map1 = new HashMap<>();
+// map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map1.put("name",tStore.getName());
+// map1.put("short_name",tStore.getName());
+// map1.put("location",tStore.getCity());
+// map1.put("address",tStore.getAddress());
+// map1.put("telephone",tStore.getPhone());
+// map1.put("linkman",userName);
+// map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
+// map1.put("logo",tStore.getCoverDrawing());
+// map1.put("remark",tStore.getIntroduce());
+// map1.put("lat",tStore.getLat());
+// map1.put("lng",tStore.getLon());
+// map1.put("space_id",tStore.getId().toString());
+// String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
+// System.out.println(result);
- for (String s : tStore.getIds().split(",")) {
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id",tStore.getId()+"");
- map.put("device_id",s);
- 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);
- }
+// for (String s : tStore.getIds().split(",")) {
+// HashMap<String, String> map = new HashMap<>();
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id",tStore.getId()+"");
+// map.put("device_id",s);
+// 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);
+// }
@@ -571,18 +583,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());
--
Gitblit v1.7.1