puzhibing
2024-03-12 032f7c07e272dae9a857ed76b480dc391dc4073f
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -275,13 +275,52 @@
            strings.add(cityManager.getCity());
        }
        HashSet<String> set1 = new HashSet<String>(strings);
        List<Store> stores = new ArrayList<>();
        if (objectType ==2 ){
            stores= storeClient.getStoreByCityManagerId(objectId);
        }else if(objectType == 3){
            stores= storeClient.getStoreByStoreStaffId(objectId);;
        List<TStore> stores = new ArrayList<>();
//        // 先判断
//        if (objectType ==2 ){
//            stores= storeClient.getStoreByCityManagerId(objectId);
//        }else if(objectType == 3){
//            stores= storeClient.getStoreByStoreStaffId(objectId);;
//        }else{
//            stores = storeClient.getStore(site.getCity());
//        }
        // 根据门店id 确定是平台还是运营商的
        TStore byId = storeService.getById(site.getStoreId());
        if (byId.getType()==1){
            // 查询平台的门店
            if (objectType ==2 ){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 1)
                .eq("operatorId",objectId));
            }else if (objectType ==2 ){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("id",objectId));
            }else{
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 1)
                );
            }
        }else{
            stores = storeClient.getStore(site.getCity());
            // 查询平台的门店
            if(objectType == 2){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 2)
                .eq("operatorId",objectId));
            }else if (objectType == 3){
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("id",objectId));
            }else{
                stores = storeService.list(new QueryWrapper<TStore>()
                        .eq("state", 1)
                        .eq("type", 2)
                        );
            }
        }
        List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
        model.addAttribute("list",site);
@@ -294,6 +333,7 @@
        model.addAttribute("type",1);
        model.addAttribute("objectType",objectType);
        model.addAttribute("objectId",objectId);
        model.addAttribute("stores",stores);
        String nextName = site.getNextName();
@@ -471,8 +511,7 @@
        site.setCityManagerId(cityManagerId);
        site.setInsertTime(new Date());
        site.setState(1);
        site.setOperatorId(UserExt.getUser().getObjectId());
//        site.setOperatorId(UserExt.getUser().getObjectId());
        // 添加场地
        HashMap<String, String> map = new HashMap<>();
@@ -598,7 +637,21 @@
        vo.setObjectType(type);
        vo.setObjectId(objectId);
        vo.setOpId(opId);
        return siteClient.listExipre(vo);
        List<TSiteDTO> tSiteDTOS = siteClient.listExipre(vo);
        for (TSiteDTO tSiteDTO : tSiteDTOS) {
            Integer storeId = tSiteDTO.getStoreId();
            TStore byId = storeService.getById(storeId);
            if (byId!=null){
                if (byId.getType()==1){
                    tSiteDTO.setOperator("平台");
                }else{
                    TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
                    if (byId1!=null)
                    tSiteDTO.setOperator(byId1.getName());
                }
            }
        }
        return tSiteDTOS;
    }
    @Autowired