玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
44323
2023-11-05 9baa55cf4292ad0fe80547f9c840e917775411f4 
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java


@@ -32,6 +32,7 @@


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.stream.Collectors;




/**


 * @author zhibing.pu


@@ -94,8 +95,8 @@


     */


    @ResponseBody


    @RequestMapping("/getCoursePackageByType")


    public List<TCoursePackage> getCoursePackageByType(Integer storeId){


        return coursePackageClient.getCoursePackageByType(storeId);


    public List<TCoursePackage> getCoursePackageByType(Integer storeId,Integer typeId){


        return coursePackageClient.getCoursePackageByType(typeId,storeId);


    }


    /**


     * 跳转到列表页


@@ -165,7 +166,9 @@


            TStore store = list2.get(0);


            List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", store.getId()).eq("state", 1));


            model.addAttribute("site", list3);


            List<Coach> coaches = coachClient.queryCoachByCity(code1);






            List<Coach> coaches = coachClient.queryCoachByOperatorId(objectId);


            model.addAttribute("coach", coaches);


            System.out.println("========type========"+type);


        }


@@ -189,6 +192,9 @@


        TCoursePackage tCoursePackage = coursePackageService.queryById(id);


        model.addAttribute("item", tCoursePackage);


        model.addAttribute("type", tCoursePackage.getType());




        Integer objectType = UserExt.getUser().getObjectType();


        model.addAttribute("objectType",objectType);




        String classStartTime = tCoursePackage.getClassStartTime();


        String classEndTime = tCoursePackage.getClassEndTime();


@@ -246,7 +252,7 @@


        model.addAttribute("store", list2);


        List<TSite> list3 = siteService.list(new QueryWrapper<TSite>().eq("storeId", tCoursePackage.getStoreId()).eq("state", 1));


        model.addAttribute("site", list3);


        List<Coach> coaches = coachClient.queryCoachByCity(cityCode);


        List<Coach> coaches = coachClient.queryCoachByOperatorId(UserExt.getUser().getObjectId());


        model.addAttribute("coach", coaches);


        List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);




@@ -832,15 +838,21 @@


        Integer objectType = UserExt.getUser().getObjectType();


        Integer objectId = UserExt.getUser().getObjectId();


        Integer storeId = null;


        if(objectType == 2){//城市管理员


            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);


            provinceCode = cityManager.getProvinceCode();


            cityCode = cityManager.getCityCode();


        List<Integer> storeIds = new ArrayList<>();




        if(objectType == 2){// 城市管理员


//            CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);


//            provinceCode = cityManager.getProvinceCode();


//            cityCode = cityManager.getCityCode();


            // 获取运营商下的门店ids


            List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))


                    .stream().map(TStore::getId).collect(Collectors.toList());


            storeIds = operatorId;


        }


        if(objectType == 3) {//城市管理员


            storeId = objectId;


        if(objectType == 3) {// 门店


            storeIds.add(objectId);


        }


        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeId, name, status, state);


        Page<Map<String, Object>> mapPage = coursePackageService.queryCoursePackageLists(provinceCode, cityCode, coursePackageTypeId, storeIds, name, status, state);


        return super.packForBT(mapPage);


    }




@@ -858,6 +870,7 @@


//        String classEndTime = coursePackage.getClassEndTime();


        Date startDate = null;


        Date endDate =null ;






        String holitime = coursePackage.getHolitime();


        if (holitime!=null&&holitime!="") {


@@ -902,10 +915,28 @@




        coursePackage.setClassStartTime(firstString);


        coursePackage.setClassEndTime(secondString);


        coursePackage.setAuditStatus(1);


        coursePackage.setStatus(1);


        coursePackage.setState(1);


        if (UserExt.getUser().getObjectType() == 1){


            coursePackage.setAuditStatus(2);


        }else{


            coursePackage.setAuditStatus(1);


        }


        coursePackage.setInsertTime(new Date());


        Integer objectType = UserExt.getUser().getObjectType();


        Integer objectId = UserExt.getUser().getObjectId();




        if (objectType==2){


            Integer storeId = coursePackage.getStoreId();


            TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("id", storeId));


            coursePackage.setProvince(store.getProvince());


            coursePackage.setProvinceCode(store.getProvinceCode());


            coursePackage.setCity(store.getCity());


            coursePackage.setCityCode(store.getCityCode());


            coursePackage.setAuditStatus(1);


        }






        // 详情多图片


//        String substring = coursePackage.getDetailDrawing().substring(0, coursePackage.getDetailDrawing().length() - 1);


//        coursePackage.setDetailDrawing(substring);


@@ -953,6 +984,10 @@


//        classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));


        coursePackage.setClassStartTime(firstString);


        coursePackage.setClassEndTime(secondString);


        coursePackage.setAuditStatus(2);


        if (UserExt.getUser().getObjectType() != 1){


            coursePackage.setAuditStatus(1);


        }


        coursePackageService.updateCoursePackage(coursePackage, coursePackagePaymentConfig);


        return ResultUtil.success();


    }