bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -309,7 +309,7 @@
            HashMap<String, String> map5 = new HashMap<>();
            map5.put("space_id", store + "");
            map5.put("area_id", site + "");
            String s5 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map5);
            String s5 = HttpRequestUtil.getRequest("https://port.daowepark.com/v7/user_api/general/get_space_sutu", map5);
            System.err.println(s5);
            JSONObject jsonObject5 = new JSONObject(s5);
            JSONArray data = jsonObject5.getJSONArray("data");
@@ -332,8 +332,8 @@
                map4.put("name", red);
                map3.put("city_code", city);
                map4.put("city_code", city);
                String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
                String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
                String s3 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
                String s4 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
                JSONObject jsonObject = new JSONObject(s3);
                JSONObject jsonObject1 = new JSONObject(s4);
                // 获取 data 字段的值
@@ -868,6 +868,7 @@

@Autowired
private IUserService userService;

    @RequestMapping("/yueyue_info/{id}")
    public String yueyue_info(@PathVariable("id") Integer id,Model model) {

@@ -933,8 +934,7 @@

        List<OrderDto> timeRanges = new ArrayList<>();


        Site site =  siteClient.listById(book.getSiteId());
        TSite site = siteService.getById(book.getSiteId());
        System.out.println("================"+site);
        String appointmentStartTime = site.getAppointmentStartTime();
        String appointmentEndTime = site.getAppointmentEndTime();
@@ -1023,9 +1023,33 @@
                List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
                tCoursePackages.addAll(coursePackageByStoreId);
            }

            List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
            if (tCoursePackages.isEmpty()){
                coursePackageByStoreIds.add(-1);
            }
            studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);

        }
        // 如果当前登陆人是门店 只查询该门店下的课包的数据
        if(UserExt.getUser().getObjectType() == 3){
            // 先查询这个运营商下的所有门店ids

            List<Integer> storeIds = new ArrayList<>();
            storeIds.add(UserExt.getUser().getObjectId());
            // 根据门店ids 查询所有课包ids
            List<TCoursePackage> tCoursePackages = new ArrayList<>();
            for (Integer storeId : storeIds) {
                List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
                tCoursePackages.addAll(coursePackageByStoreId);
            }
            List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
            if (tCoursePackages.isEmpty()){
                coursePackageByStoreIds.add(-1);
            }
            studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
        }

        List<Map<String, Object>>  pays = coursePackageClient.getStudentTotal(studentQeryDto);
        return pays;
    }