Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

44323

2024-03-11 52276cea4d1b2b45406dc3e1d3d8feb4950f71aa

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

@@ -289,6 +289,12 @@
            System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
//        model.addAttribute("couponIds", "3,2");
        }


           Integer able  =  coursePackageClient.queryAble(id);

        model.addAttribute("able",able);

        return PREFIX + "coursePackage_edit.html";
    }

@@ -734,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;
@@ -743,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
@@ -1120,7 +1136,7 @@
    public ResultUtil editCoursePackageState1(Integer id, Integer state){
        TCoursePackage coursePackage = new TCoursePackage();
        coursePackage.setId(id);
        coursePackage.setStatus(state);
        coursePackage.setState(state);
        coursePackageService.editCoursePackageState(coursePackage);
        return ResultUtil.success();
    }
@@ -1292,7 +1308,7 @@
     */
    @ResponseBody
    @PostMapping("/makeUpMissedLessons")
    public ResultUtil makeUpMissedLessons(Long id){
    public ResultUtil makeUpMissedLessons(Integer id){
        System.out.println("==========coursePackage补课PaymentId======"+id);
        return coursePackageService.makeUpMissedLessons(id);
    }