Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-14 d20dbd5d97b3f418533d5d23fd337cdec9f95939

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java

@@ -56,26 +56,25 @@
    private TokenUtil tokenUtil;



    /**
     * 根据门店ids获取课包ids 根据课包ids 获取购课记录的用户ids
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/getCoursePackageByStoreIds")
    public List<Integer> getCoursePackageByStoreIds(@RequestBody List<Integer> storeIds){
    public List<Integer> getCoursePackageByStoreIds(@RequestBody List<Integer> storeIds) {
        try {
            // 获取当前课包的ids
            List<Integer> courseIds = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", storeIds))
                    .stream().map(TCoursePackage::getId).collect(Collectors.toList());
            if (courseIds.size() == 0){
            if (courseIds.size() == 0) {
                return new ArrayList<>();
            }else{
            } else {
                List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds))
                        .stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
                return userIds;
            }

        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
@@ -84,16 +83,17 @@

    /**
     * 根据id获取课包
     *
     * @param id
     * @return
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/queryCoursePackageById")
    public TCoursePackage queryCoursePackageById(@RequestBody Integer id){
    public TCoursePackage queryCoursePackageById(@RequestBody Integer id) {
        try {
            TCoursePackage coursePackage = coursePackageService.getById(id);
            return coursePackage;
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
@@ -101,11 +101,11 @@

    @ResponseBody
    @PostMapping("/base/coursePackage/queryByStoreId")
    public List<TCoursePackage> queryByStoreId(@RequestBody Integer shopId){
    public List<TCoursePackage> queryByStoreId(@RequestBody Integer shopId) {
        try {
            List<TCoursePackage> shopId1 = coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", shopId));
            return shopId1;
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
@@ -116,14 +116,14 @@

    @ResponseBody
    @PostMapping("/base/coursePackage/queryByCode")
    public Integer queryByCode(@RequestBody String code){
    public Integer queryByCode(@RequestBody String code) {


        return packagePaymentService.listStoreId(code);
    }

@Autowired
private CoursePackageStudentService coursePackageStudentService;
    @Autowired
    private CoursePackageStudentService coursePackageStudentService;

    @Autowired
    private UserVideoDetailsService userVideoDetailsService;
@@ -131,35 +131,38 @@

    @ResponseBody
    @PostMapping("/base/coursePackage/counts")
    public Integer counts(@RequestBody Integer stuId){
    return     coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("signInOrNot",1).eq("studentId",stuId));
    public Integer counts(@RequestBody Integer stuId) {
        return coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("signInOrNot", 1).eq("studentId", stuId));

    }

    @ResponseBody
    @PostMapping("/base/coursePackage/counts1")
    public Integer counts1(@RequestBody Integer stuId){
        return  userVideoDetailsService.count(new QueryWrapper<UserVideoDetails>().eq("appUserId",stuId))  ;
    public Integer counts1(@RequestBody Integer stuId) {
        return userVideoDetailsService.count(new QueryWrapper<UserVideoDetails>().eq("appUserId", stuId));

    }

    /**
     * 根据id获取课包
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/getCoursePackageByStoreId")
    public List<TCoursePackage> getCoursePackageByStoreId(@RequestBody Integer storeId){
    public List<TCoursePackage> getCoursePackageByStoreId(@RequestBody Integer storeId) {

       return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", storeId));
        return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("storeId", storeId));
    }

    /**
     * 根据课包类型获取课包
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/getCoursePackageByType/{typeId}/{storeId}")
    public List<TCoursePackage> getCoursePackageByType(@PathVariable("typeId") Integer typeId,@PathVariable("storeId")Integer storeId){
    public List<TCoursePackage> getCoursePackageByType(@PathVariable("typeId") Integer typeId, @PathVariable("storeId") Integer storeId) {

       return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId).eq("storeId",storeId));
        return coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("coursePackageTypeId", typeId).eq("storeId", storeId));
    }

    /**
     * 本周福利列表
     */
@@ -168,31 +171,31 @@
    @ApiOperation(value = "本周福利-限时折扣列表", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "discountType",value = "默认显示 限时折扣 (1限时折扣 2赠送课时)",dataType = "int"),
            @ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
            @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
            @ApiImplicitParam(name = "discountType", value = "默认显示 限时折扣 (1限时折扣 2赠送课时)", dataType = "int"),
            @ApiImplicitParam(name = "lon", value = "经度", dataType = "String"),
            @ApiImplicitParam(name = "lat", value = "纬度", dataType = "String"),
    })
    public ResultUtil<List<Details>> thisWeeksBenefitList(Integer discountType, String lon, String lat) throws Exception {
//        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
                return ResultUtil.tokenErr();
        Integer appUserId = tokenUtil.getUserIdFormRedis();
        if (null == appUserId) {
            return ResultUtil.tokenErr();
        }
        String[] strings = {"今日", "明日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"};
        List<String> stringList = new ArrayList<>(Arrays.asList(strings));

        List<Details> weeksBenefitCourse = tcpdService.getWeeksBenefitCourse(appUserId, discountType, lon, lat);

        weeksBenefitCourse.sort(new Comparator<Details>() {
            @Override
            public int compare(Details o1, Details o2) {
                return stringList.indexOf(o1.getDataTime()) - stringList.indexOf(o2.getDataTime());
            }
            String [] strings = {"今日","明日","周一","周二","周三","周四","周五","周六","周日"};
            List<String> stringList = new ArrayList<>(Arrays.asList(strings));

            List<Details> weeksBenefitCourse = tcpdService.getWeeksBenefitCourse(appUserId, discountType, lon, lat);

            weeksBenefitCourse.sort(new Comparator<Details>() {
                @Override
                public int compare(Details o1, Details o2) {
                    return stringList.indexOf(o1.getDataTime()) - stringList.indexOf(o2.getDataTime());
                }
            });
        });


//            return ResultUtil.success(tcpdService.getWeeksBenefitCourse(appUserId,discountType,lon,lat));
            return ResultUtil.success(weeksBenefitCourse);
        return ResultUtil.success(weeksBenefitCourse);
//        }catch (Exception e){
//            return ResultUtil.runErr();
//        }
@@ -207,13 +210,13 @@
    @ApiOperation(value = "本周福利-折扣课包详情", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "coursePackageDiscountId",value = "限时折扣配置id/赠送课时配置id",dataType = "int"),
            @ApiImplicitParam(name = "lon",value = "经度",dataType = "String"),
            @ApiImplicitParam(name = "lat",value = "纬度",dataType = "String"),
            @ApiImplicitParam(name = "coursePackageDiscountId", value = "限时折扣配置id/赠送课时配置id", dataType = "int"),
            @ApiImplicitParam(name = "lon", value = "经度", dataType = "String"),
            @ApiImplicitParam(name = "lat", value = "纬度", dataType = "String"),
    })
    public ResultUtil<ExchangeCoursePackageResponse> discountCourseDatas(Integer coursePackageDiscountId,String lon,String lat){
    public ResultUtil<ExchangeCoursePackageResponse> discountCourseDatas(Integer coursePackageDiscountId, String lon, String lat) {
//        try {
            return ResultUtil.success(tcpdService.getWeekFreeCourseDetails(coursePackageDiscountId,lat,lon));
        return ResultUtil.success(tcpdService.getWeekFreeCourseDetails(coursePackageDiscountId, lat, lon));
//        }catch (Exception e){
//            return ResultUtil.runErr();
//        }
@@ -222,20 +225,20 @@

    @ResponseBody
    @PostMapping("/base/coursePack/courseList")
    public List<StoreOfCourseVo> getStoreOfCourseList(@RequestBody Integer storeId){
    public List<StoreOfCourseVo> getStoreOfCourseList(@RequestBody Integer storeId) {
        List<StoreOfCourseVo> courseVoList = new ArrayList<>();
        Store store = storeClient.queryStoreById(storeId);
        List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>()
                .eq("storeId", storeId)
                .eq("auditStatus",2)
                .eq("state",1).orderByDesc("insertTime"));
        if (list.size() >  0){
                .eq("auditStatus", 2)
                .eq("state", 1).orderByDesc("insertTime"));
        if (list.size() > 0) {
            for (TCoursePackage coursePackage : list) {
                int count = tcppmenService.count(new QueryWrapper<TCoursePackagePayment>()
                        .eq("coursePackageId",coursePackage.getId()));
                        .eq("coursePackageId", coursePackage.getId()));
                StoreOfCourseVo courseVo = new StoreOfCourseVo();
                courseVo.setCourseId(coursePackage.getId());
                courseVo.setName(coursePackage.getName()+"(" + store.getName() + ")");
                courseVo.setName(coursePackage.getName() + "(" + store.getName() + ")");


                String classStartTime = coursePackage.getClassStartTime();
@@ -243,9 +246,9 @@
                ArrayList<String> classTime = new ArrayList<>();
                String[] split4 = classStartTime.split(",");
                String[] split3 = classEndTime.split(",");
                if(ToolUtil.isNotEmpty(classStartTime)){
                if (ToolUtil.isNotEmpty(classStartTime)) {
                    for (int i = 0; i < split4.length; i++) {
                        String s = split4[i].substring(0,5) + "-" +  split3[i].substring(0,5);
                        String s = split4[i].substring(0, 5) + "-" + split3[i].substring(0, 5);
                        classTime.add(s);
                    }
                }
@@ -254,12 +257,11 @@
                String classTimeAsString = String.join("|", classTime);



                courseVo.setClassStartTime(classTimeAsString);
                courseVo.setCoverDrawing(coursePackage.getCoverDrawing());
                courseVo.setApplicantsNumber(count);
                List<CoursePackagePaymentConfig> list1 = icppconfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
                        .eq("coursePackageId",coursePackage.getId()));
                        .eq("coursePackageId", coursePackage.getId()));
//                取价格最低的课时
                CoursePackagePaymentConfig minConfig = list1.stream()
                        .min(Comparator.comparingDouble(CoursePackagePaymentConfig::getCashPayment))
@@ -269,7 +271,7 @@
                    classHours.add(coursePackagePaymentConfig.getClassHours());
                }

                if (minConfig != null){
                if (minConfig != null) {
                    courseVo.setClassHours(classHours);
                    courseVo.setOriginalPrice(minConfig.getCashPayment());
                    courseVo.setCoin(minConfig.getPlayPaiCoin());
@@ -283,24 +285,26 @@

    /**
     * 根据id获取课包
     *
     * @param coursePackConfigId
     * @return
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/queryConfigCoursePackData")
    public CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId){
    public CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId) {
        return icppconfigService.getById(coursePackConfigId);
    }


    /**
     * 获取课包管理列表数据
     *
     * @param queryCoursePackageLists
     * @return
     */
    @ResponseBody
    @PostMapping("/coursePackage/queryCoursePackageLists")
    public Page<Map<String, Object>> queryCoursePackageLists(@RequestBody QueryCoursePackageLists queryCoursePackageLists){
    public Page<Map<String, Object>> queryCoursePackageLists(@RequestBody QueryCoursePackageLists queryCoursePackageLists) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryCoursePackageLists.getLimit(), queryCoursePackageLists.getOffset(), queryCoursePackageLists.getSort(), queryCoursePackageLists.getOrder());
        Page<Map<String, Object>> mapPage = page.setRecords(coursePackageService.queryCoursePackageLists(page, queryCoursePackageLists));
        return mapPage;
@@ -309,12 +313,14 @@

    /**
     * 添加数据
     *
     * @param coursePackage
     * @return
     */
    @ResponseBody
    @PostMapping("/coursePackage/addCoursePackage")
    public Integer addCoursePackage(@RequestBody TCoursePackage coursePackage){
    public Integer addCoursePackage(@RequestBody TCoursePackage coursePackage) {
        coursePackage.setInsertTime(new Date());
        coursePackage.setNeedNum(coursePackage.getCodeTime());
        return coursePackageService.addCoursePackage(coursePackage);
    }
@@ -322,24 +328,25 @@

    /**
     * 修改数据
     *
     * @param coursePackage
     */
    @ResponseBody
    @PostMapping("/coursePackage/updateCoursePackageById")
    public void updateCoursePackageById(@RequestBody TCoursePackage coursePackage){
    public void updateCoursePackageById(@RequestBody TCoursePackage coursePackage) {
        coursePackageService.updateCoursePackageById(coursePackage);
    }



    /**
     * 获取课包审核列表
     *
     * @param queryExamineCoursePackageLists
     * @return
     */
    @ResponseBody
    @PostMapping("/coursePackage/queryExamineCoursePackageLists")
    public Page<Map<String, Object>> queryExamineCoursePackageLists(@RequestBody QueryExamineCoursePackageLists queryExamineCoursePackageLists){
    public Page<Map<String, Object>> queryExamineCoursePackageLists(@RequestBody QueryExamineCoursePackageLists queryExamineCoursePackageLists) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage(queryExamineCoursePackageLists.getLimit(), queryExamineCoursePackageLists.getOffset(),
                queryExamineCoursePackageLists.getSort(), queryExamineCoursePackageLists.getOrder());
        Page<Map<String, Object>> mapPage = page.setRecords(coursePackageService.queryExamineCoursePackageLists(page, queryExamineCoursePackageLists));