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


@@ -10,6 +10,7 @@


import com.dsh.course.feignClient.account.CoachClient;


import com.dsh.course.feignClient.account.model.CityManager;


import com.dsh.course.feignClient.account.model.Coach;


import com.dsh.course.feignClient.account.model.CoachSerchVO;


import com.dsh.course.feignClient.course.*;


import com.dsh.course.feignClient.course.model.*;


import com.dsh.course.feignClient.other.model.Site;


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


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.stream.Collectors;




/**


 * @author zhibing.pu


@@ -165,7 +167,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);


        }


@@ -249,8 +253,18 @@


        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);


        model.addAttribute("coach", coaches);


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


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


            model.addAttribute("coach", coaches);


        }else{


            CoachQuery coachQuery = new CoachQuery();


            coachQuery.setProvince(tCoursePackage.getProvince());


            coachQuery.setCity(tCoursePackage.getCity());


            List<CoachSerchVO> coachSerchVOS = coachClient.listAll(coachQuery);


            model.addAttribute("coach",coachSerchVOS);


        }






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






@@ -409,6 +423,8 @@


            map.put("coursePackageDiscount", tCoursePackageDiscounts);


            list.add(map);


        }


        model.addAttribute("role",UserExt.getUser().getObjectType());


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


        model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));


        return PREFIX + "coursePackageDiscount.html";


    }


@@ -835,15 +851,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);


    }




@@ -856,7 +878,8 @@


     */


    @ResponseBody


    @PostMapping("/addCoursePackage")


    public ResultUtil addCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) throws ParseException {


    public ResultUtil addCoursePackage(TCoursePackage coursePackage,


                                       String coursePackagePaymentConfig) throws ParseException {


        String classStartTime = coursePackage.getClassStartTime();


//        String classEndTime = coursePackage.getClassEndTime();


        Date startDate = null;


@@ -872,7 +895,14 @@


            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");


            startDate = dateFormat.parse(startDateString);


            endDate = dateFormat.parse(endDateString);




            if (coursePackage.getType() == 2){


                startDate.setHours(0);


                startDate.setMinutes(0);


                startDate.setSeconds(0);


                endDate.setHours(23);


                endDate.setMinutes(59);


                endDate.setSeconds(59);


            }


        }






@@ -906,9 +936,13 @@




        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();


@@ -920,6 +954,7 @@


            coursePackage.setProvinceCode(store.getProvinceCode());


            coursePackage.setCity(store.getCity());


            coursePackage.setCityCode(store.getCityCode());


            coursePackage.setAuditStatus(1);


        }






@@ -970,6 +1005,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();


    }