From a540a342416302805adfb1599599bbbbaa191030 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 08 八月 2025 23:42:13 +0800 Subject: [PATCH] 赛事模块 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java index c468218..a3a092c 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java @@ -221,18 +221,27 @@ @RequestMapping("/siteDetailsOfSearch") @ResponseBody public Object siteDetailsOfSearch(String provinceId,String cityId,Integer operatorId,String storeName){ + List<Map<String, Object>> res = new ArrayList<>(); Integer storeId = null; if (UserExt.getUser().getObjectType()== 2){ // 筛选这个运营商下的门店 operatorId = UserExt.getUser().getObjectId(); - } - if (UserExt.getUser().getObjectType()== 3){ + List<Integer> storeIds = storeService.lambdaQuery().eq(TStore::getOperatorId, operatorId).list() + .stream().map(TStore::getId).collect(Collectors.toList()); + if (storeIds.isEmpty()){ + storeIds.add(0); + } + res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds); + }else if (UserExt.getUser().getObjectType()== 3){ // 筛选这个运营商下的门店 storeId = UserExt.getUser().getObjectId(); + res = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId); + }else{ + List<Integer> storeIds = new ArrayList<>(); + res = storeService.querySiteListOfpageOperator(provinceId,cityId,operatorId,storeName,storeIds); } - List<Map<String,Object>> storeList = storeService.querySiteListOfpage(provinceId,cityId,operatorId,storeName,storeId); - if (storeList.size() > 0 ){ - for (Map<String, Object> stringObjectMap : storeList) { + if (res.size() > 0 ){ + for (Map<String, Object> stringObjectMap : res) { String provinceName = (String) stringObjectMap.get("province"); String cityName = (String) stringObjectMap.get("city"); stringObjectMap.put("provinceCity",provinceName+cityName); @@ -255,7 +264,7 @@ } } - return storeList; + return res; } /** @@ -396,6 +405,8 @@ if (imgFile != null){ String originalFilename = imgFile.getOriginalFilename(); String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf(".")); + + String url = OssUploadUtil.ossUpload("img/",imgFile); Map<String, String> map = new HashMap<String, String>(); //是否上传成功 -- Gitblit v1.7.1