From 1b7f0a8746bc09a3e0cfdef9610ca4e08ed919e2 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 27 十月 2023 16:14:31 +0800 Subject: [PATCH] 商户认证 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 68 +++++++++++++++++++++++++++++++-- 1 files changed, 63 insertions(+), 5 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 d0c6694..f10b1d3 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,9 @@ @Autowired private TOperatorService tOperatorService; + @Autowired + private ITSiteService siteService; + /** * 跳转到车辆管理首页 @@ -96,12 +101,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 +132,35 @@ // } model.addAttribute("yysList",list1); + model.addAttribute("objectType",UserExt.getUser().getObjectType()); return PREFIX + "TShop_add.html"; } + // 运营商根据省筛选市区 + @RequestMapping("/getCityYys") + @ResponseBody + public Object getCityYys(String province) { + Integer objectId = UserExt.getUser().getObjectId(); + + // todo + // 通过选择的省 获取管理的市 + TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>() + .eq("code",province).eq("operatorId",objectId)); + + List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>() + .eq("pid", province).eq("operatorId", UserExt.getUser().getObjectId())); + if (list.size() == 0){ + // 管理整个省 获取这个省下的所有市 + List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); + // 拿到省的id + 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("/tShop_add_one") public String tCompetitionAddOne(Integer id,Model model) { List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); @@ -402,18 +448,30 @@ user.setPassword(SecureUtil.md5("a123456")); user.setObjectType(3); user.setStatus(1); - user.setObjectId(tStore.getId()); userMapper.insert(user); tStore.setStoreStaffId(user.getId()); tStore.setLon(lon); tStore.setLat(lat); tStore.setOperatorId(UserExt.getUser().getObjectId()); storeService.save(tStore); + user.setObjectId(tStore.getId()); + // 添加场地 + 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++) { @@ -452,7 +510,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); -- Gitblit v1.7.1