44323
2024-03-11 d22e7172537d9a658e83dbe76bb267c7611642c1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -740,8 +740,9 @@
    @ResponseBody
    @PostMapping("/queryCity1/{code}")
    public ResultUtil queryCity1(@PathVariable("code") String code){
    @PostMapping("/queryCity1/{code}/{$operationId}")
    public ResultUtil queryCity1(@PathVariable("code") String code,
                                 @PathVariable("$operationId") String operationId){
        Integer objectType = UserExt.getUser().getObjectType();
        Integer objectId = UserExt.getUser().getObjectId();
        String cityCode = null;
@@ -749,9 +750,18 @@
//            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
//            cityCode = cityManager.getCityCode();
//        }
        System.out.println("======="+storeService.queryCity(code, cityCode));
        Integer operatorId= 0;
        Integer type= 0;
        if (operationId.equals("平台")){
            type = 1;
            operatorId = null;
        }else{
            operatorId = Integer.valueOf(operationId);
            type = 2;
        }
//        return storeService.queryCity(code, cityCode);
        return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
        return new ResultUtil(0,null,null,storeService.queryCity2(code, cityCode
        ,type,operatorId),null);
    }
    @ResponseBody