玩湃微信商户分账

无关风月

2024-09-24 61bbd595ee2bc3c67b40878894dcc07174c6eea6

 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<>();
@@ -480,7 +519,7 @@
        map.put("name",site.getName());
        map.put("space_id",store.getId().toString());
        String s = HttpRequestUtil.postRequest
                ("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
                ("https://port.daowepark.com/v7/user_api/general/addSpaceArea", map);
        JSONObject jsonObject = JSONObject.parseObject(s);
        JSONObject data = jsonObject.getJSONObject("data");
        String area_id = data.getString("area_id");
@@ -529,7 +568,7 @@
//        map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
//        if(StringUtils.hasLength(ids)) {
//            for (String s : ids.split(",")) {
//                String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s, map);
//                String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s, map);
//                System.out.println(s1);
//            }
//        }
@@ -541,7 +580,7 @@
//                map1.put("device_id", s);
//                map1.put("region_id", site.getId() + "");
//                // 添加门禁
//                String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
//                String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addDevice", map1);
//                System.out.println(s1);
//            }
//        }