From 1e790795f4e2c365f604ecc0fc1b290e3ff3c35f Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期五, 20 十月 2023 09:34:22 +0800 Subject: [PATCH] 更新bug --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java index 1ed5022..a699e6d 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java @@ -39,6 +39,7 @@ @Autowired private TBackRecordService backRecordService; + /** * 根据城市管理员id获取门店 */ @@ -219,14 +220,34 @@ @PostMapping("/store/queryStoreByIds") public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){ try { - return storeService.list(new LambdaQueryWrapper<Store>() - .in(Store::getId,ids)); + List<Store> list = storeService.list(new LambdaQueryWrapper<Store>() + .in(Store::getId, ids)); + for (Store store : list) { + Integer operatorId = store.getOperatorId(); + if(operatorId == null){ + operatorId=-1; + } + String name = storeService.getOName(operatorId); + store.setOName(name); + } + return list; }catch (Exception e){ e.printStackTrace(); return new ArrayList<>(); } } + @ResponseBody + @PostMapping("/store/queryStoreIdByCityCode") + List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect){ + try { + return storeService.list(new LambdaQueryWrapper<Store>() + .in(Store::getCityCode,collect)).stream().map(Store::getId).collect(Collectors.toList()); + }catch (Exception e){ + e.printStackTrace(); + return new ArrayList<>(); + } + } @@ -236,10 +257,11 @@ @ApiImplicitParams({ @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = false), @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false), + @ApiImplicitParam(value = "cityCode", name = "cityCode", dataType = "string", required = false), }) - public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat){ + public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat,String cityCode){ try { - List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat); + List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat,cityCode); return ResultUtil.success(baseVos); }catch (Exception e){ e.printStackTrace(); -- Gitblit v1.7.1