bug修改

无关风月

2025-12-26 d47bf3e1e3bf56b60ea6a1649ddd618d5ae803f1

bug修改

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

@@ -722,7 +722,8 @@
        );
        List<Long> collect = list1.stream().map(CoursePackageOrderStudent::getId).collect(Collectors.toList());

        QueryWrapper<CourseCounsum> in = new QueryWrapper<CourseCounsum>().in("paymentId", collect).in("changeType", changes);
        QueryWrapper<CourseCounsum> in = new QueryWrapper<CourseCounsum>()
                .in("paymentId", collect).in("changeType", changes);

        if (recordTimeRequest.getType() != null) {
            if (recordTimeRequest.getType() == 2) {

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java

@@ -1529,6 +1529,8 @@
        // 添加购买课时 paytyoe为7
        // 排课可期  判断课程时间段  添加排课表  添加上课记录表
        // 找到原来的课包 扣课时
        System.err.println("课后联系购买");
        System.err.println("请求参"+ req);
        CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getById(req.getOldCourseId());
        if (req.getNum() > coursePackageOrderStudent.getLaveClassHours()) {
            return ResultUtil.error("当前课包课时数不足");

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java

@@ -1369,7 +1369,7 @@

                    //开始排课
                    if(b){
                        addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
                        addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
                    }

                    //课时记录
@@ -1417,10 +1417,13 @@
                    studentClient.frozen(student);

                    //中间断课，没有连续续费的情况需要重新排课
                    if (useTime.compareTo(new Date()) < 0 && b) {
                        addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
//                    if (useTime.compareTo(new Date()) < 0 && b) {
//                        addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
//                    }
                    //开始排课
                    if(b){
                        addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
                    }

                    //课时记录
                    CourseCounsum courseCounsum = new CourseCounsum();
                    courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
@@ -1442,7 +1445,7 @@
                }
            }
            if(coursePackage.getType() == 2){
                addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);
                addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), null, null);
            }
        }
    }
@@ -1451,12 +1454,17 @@
    /**
     * 新购买课程后的排课
     *
     * @param userId
     * @param sId
     * @throws ParseException
     */
    private void addPackageStudent(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
    private void addPackageStudent(TCoursePackage tCoursePackage, CoursePackageOrder coursePackageOrder, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
        try {
            Integer userId = coursePackageOrder.getAppUserId();
            //扣除课时数
            Integer codeTime = tCoursePackage.getCodeTime();
            Integer totalClassHours = coursePackageOrder.getClassHours();
            // 排课次数
            Integer schedulingNum= totalClassHours/codeTime;
            //1常规 2假期 3体验
            if (tCoursePackage.getType() == 1) {
                //上课星期
@@ -1469,23 +1477,23 @@
                        .orderByDesc("classDate")
                        .last(" limit 0, 1")
                );
                if(null != one){
                    //先检测是否需要继续进行排课
                    Calendar calendar1 = Calendar.getInstance();
                    calendar1.setTime(one.getClassDate());
                    int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
                    day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
                    int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);

                    Calendar calendar2 = Calendar.getInstance();
                    calendar2.setTime(new Date());
                    int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);

                    //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
                    if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
                        return;
                    }
                }
//                if(null != one){
//                    //先检测是否需要继续进行排课
//                    Calendar calendar1 = Calendar.getInstance();
//                    calendar1.setTime(one.getClassDate());
//                    int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
//                    day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
//                    int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
//
//                    Calendar calendar2 = Calendar.getInstance();
//                    calendar2.setTime(new Date());
//                    int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
//
//                    //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
//                    if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
//                        return;
//                    }
//                }

                //上课时段
                String[] split = tCoursePackage.getClassStartTime().split(",");
@@ -1495,11 +1503,14 @@

                //剩余课时
                Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
                //扣除课时数
                Integer codeTime = tCoursePackage.getCodeTime();
                //排课 本周+下周，课时不够扣则直接剩余不排课

                //排课 课时不够扣则直接剩余不排课
                Calendar calendar = Calendar.getInstance();
                calendar.setTime(new Date());
                if (one!=null){
                    calendar.setTime(one.getClassDate());
                }else{
                    calendar.setTime(new Date());
                }
                calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
                calendar.set(Calendar.HOUR_OF_DAY, 0);
                calendar.set(Calendar.MINUTE, 0);
@@ -1508,7 +1519,7 @@
                day_week = day_week - 1 == 0 ? 7 : day_week - 1;
                int num = 8 - day_week + 7;

                for (int i = 0; i < num; i++) {
                for (int i = 0; i < schedulingNum; i++) {
                    Date time = calendar.getTime();

                    //判断当天是否在排课星期内
@@ -1516,6 +1527,7 @@
                    day = day - 1 == 0 ? 7 : day - 1;
                    if (!week.contains(day)) {
                        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
                        schedulingNum--;
                        continue;
                    }

@@ -1536,6 +1548,8 @@
                    //有体验购课，不进行排课
                    if(count != 0){
                        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
                        schedulingNum--;

                        continue;
                    }


 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -1,5 +1,6 @@
package com.dsh.other.controller;

import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONArray;
@@ -963,6 +964,8 @@
                .stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
        List<Site> list = siteService.list(new QueryWrapper<Site>().eq("state", 1).eq("storeId", storeId)
                .orderByDesc("insertTime"));
        String now = DateUtil.now().substring(11, 19);

        if (list.size() > 0) {
            for (Site site : list) {
                List<TSitePrice> tSitePrices = priceMap.get(site.getId());
@@ -974,11 +977,14 @@
                vo.setSiteTime("");
                vo.setPrice(0.0);
                if (tSitePrices!=null&& !tSitePrices.isEmpty()){
                    BigDecimal bigDecimal = tSitePrices.get(0).getCashPrice();
                    BigDecimal bigDecimal = BigDecimal.ZERO;
                    // 遍历 查询最小的价格
                    for (TSitePrice tSitePrice : tSitePrices) {
                        if (bigDecimal.compareTo(tSitePrice.getCashPrice()) > 0) {
                            bigDecimal = tSitePrice.getCashPrice();
                        // 当前时间再范围之内
                        if (tSitePrice.getStartTime().compareTo(now) <= 0 && tSitePrice.getEndTime().compareTo(now) >= 0) {
                            if (tSitePrice.getCashPrice().compareTo(bigDecimal) > 0) {
                                bigDecimal = tSitePrice.getCashPrice();
                            }
                        }
                    }
                    vo.setPrice(bigDecimal.doubleValue());

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -90,7 +90,14 @@
    private ISiteService siteService;



//    public static void main(String[] args) {
//        String now = DateUtil.now().substring(11, 19);
//        System.err.println(now);
//        if ("17:00:00".compareTo(now) <= 0 && "19:00:00".compareTo(now) >= 0) {
//            System.err.println("yes");
//        }
//
//    }

    /**
     * 获取场地列表
@@ -104,10 +111,12 @@
        querySiteList.setPageNum((querySiteList.getPageNum() - 1) * querySiteList.getPageSize());
        DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek();
        Map<Integer, List<TSitePrice>> priceMap = sitePriceService.lambdaQuery().eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue())
                .eq(querySiteList.getTargetAudience()!=null,TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
                .eq(querySiteList.getTargetAudience() != null, TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
                .list()
                .stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
        List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
        // 获取当前时间 只需要时分秒 格式hh:mm:ss
        String now = DateUtil.now().substring(11, 19);
        for (QuerySiteListVo querySiteListVo : querySiteListVos) {
            querySiteListVo.setPrice(0.0);
            querySiteListVo.setTimes("");
@@ -116,16 +125,19 @@
                continue;
            }
            List<TSitePrice> tSitePrices = priceMap.get(querySiteListVo.getId());
            if (tSitePrices!=null&& !tSitePrices.isEmpty()){
                BigDecimal bigDecimal = tSitePrices.get(0).getCashPrice();
            if (tSitePrices != null && !tSitePrices.isEmpty()) {
                BigDecimal bigDecimal = BigDecimal.ZERO;
                // 遍历 查询最小的价格
                for (TSitePrice tSitePrice : tSitePrices) {
                    if (bigDecimal.compareTo(tSitePrice.getCashPrice()) > 0) {
                        bigDecimal = tSitePrice.getCashPrice();
                    // 当前时间再范围之内
                    if (tSitePrice.getStartTime().compareTo(now) <= 0 && tSitePrice.getEndTime().compareTo(now) >= 0) {
                        if (tSitePrice.getCashPrice().compareTo(bigDecimal) > 0) {
                            bigDecimal = tSitePrice.getCashPrice();
                        }
                    }
                }
                querySiteListVo.setPrice(bigDecimal.doubleValue());
                querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size()-1).getEndTime());
                querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size() - 1).getEndTime());
            }
            Map<String, Double> distance = GeodesyUtil.getDistance(querySiteList.getLon() + "," + querySiteList.getLat(), querySiteListVo.getStoreLon() + "," + querySiteListVo.getStoreLat());
            double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
@@ -316,42 +328,42 @@
                    count++;
                }
            }
            if (querySiteTimes.getSelectable() == 1&&end.before(now)){
            if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
                querySiteTimes.setSelectable(0);
            }
            if (end.before(now)){
            if (end.before(now)) {
                querySiteTimes.setSelectable(0);
            }
            querySiteTimes.setSelectCount(count);
            if (flag == 0 &&  querySiteTimes.getSelectable() == 1) {
            if (flag == 0 && querySiteTimes.getSelectable() == 1) {
                // 当前时间段还没有预约
                Integer walkinCapacity = site.getWalkinCapacity();
                // 计算散客预约人数和最大散客容纳数
                System.err.println("预约人数" + count);
                System.err.println("最大散客容纳数" + walkinCapacity);
                if (walkinCapacity <= count) {
                    if (targetAudience==1 && walkinCapacity!=0){
                    if (targetAudience == 1 && walkinCapacity != 0) {
                        // 不可预约
                        System.err.println("不可预约 也不能散客");
                        querySiteTimes.setSelectable(0);
                        querySiteTimes.setIsReserve(0);
                    }else if (targetAudience==2){
                    } else if (targetAudience == 2) {
                        // 不能散客
                        System.err.println("不可预约 也不能散客");
                        querySiteTimes.setSelectable(0);
                        querySiteTimes.setIsReserve(0);
                    }else{
                    } else {
                        querySiteTimes.setSelectable(1);
                    }
                }else{
                    if (targetAudience==2){
                } else {
                    if (targetAudience == 2) {
                        // 散客只能预约当前时间段
                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                        String nowStr = simpleDateFormat.format(now);
                        // 判断当前时间有没有在timePriceStart和timePriceEnd之间
                        if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart),  simpleDateFormat.parse(timePriceEnd))) {
                        if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
                            querySiteTimes.setSelectable(1);
                        }else{
                        } else {
                            querySiteTimes.setSelectable(0);
                        }
                    }
@@ -554,42 +566,42 @@
                    count++;
                }
            }
            if (querySiteTimes.getSelectable() == 1&&end.before(now)){
            if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
                querySiteTimes.setSelectable(0);
            }
            if (end.before(now)){
            if (end.before(now)) {
                querySiteTimes.setSelectable(0);
            }
            querySiteTimes.setSelectCount(count);
            if (flag == 0 &&  querySiteTimes.getSelectable() == 1) {
            if (flag == 0 && querySiteTimes.getSelectable() == 1) {
                // 当前时间段还没有预约
                Integer walkinCapacity = site.getWalkinCapacity();
                // 计算散客预约人数和最大散客容纳数
                System.err.println("预约人数" + count);
                System.err.println("最大散客容纳数" + walkinCapacity);
                if (walkinCapacity <= count) {
                    if (targetAudience==1 && walkinCapacity!=0){
                    if (targetAudience == 1 && walkinCapacity != 0) {
                        // 不可预约
                        System.err.println("不可预约 也不能散客");
                        querySiteTimes.setSelectable(0);
                        querySiteTimes.setIsReserve(0);
                    }else if (targetAudience==2){
                    } else if (targetAudience == 2) {
                        // 不能散客
                        System.err.println("不可预约 也不能散客");
                        querySiteTimes.setSelectable(0);
                        querySiteTimes.setIsReserve(0);
                    }else{
                    } else {
                        querySiteTimes.setSelectable(1);
                    }
                }else{
                    if (targetAudience==2){
                } else {
                    if (targetAudience == 2) {
                        // 散客只能预约当前时间段
                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                        String nowStr = simpleDateFormat.format(now);
                        // 判断当前时间有没有在timePriceStart和timePriceEnd之间
                        if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart),  simpleDateFormat.parse(timePriceEnd))) {
                        if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
                            querySiteTimes.setSelectable(1);
                        }else{
                        } else {
                            querySiteTimes.setSelectable(0);
                        }
                    }
@@ -685,12 +697,14 @@


    }

    /**
     * 判断两个时间段是否有交集
     *
     * @param start1 第一个时间段开始时间
     * @param end1 第一个时间段结束时间
     * @param end1   第一个时间段结束时间
     * @param start2 第二个时间段开始时间
     * @param end2 第二个时间段结束时间
     * @param end2   第二个时间段结束时间
     * @return 如果有交集返回true，否则返回false
     */
    private boolean isTimePeriodsIntersect(String start1, String end1, String start2, String end2) {
@@ -788,7 +802,7 @@
                }
                if (querySiteTime.getTime().equals(time)) {
                    money = money.add(querySiteTime.getCashPrice());
                    playCoin = playCoin+querySiteTime.getCoinPrice();
                    playCoin = playCoin + querySiteTime.getCoinPrice();
                    break;
                }
            }
@@ -861,9 +875,9 @@
        siteBooking.setBooker(reservationSite.getBooker());
        siteBooking.setPhone(reservationSite.getPhone());
        siteBooking.setPayType(reservationSite.getPayType());
        if (reservationSite.getPayType()==3){
        if (reservationSite.getPayType() == 3) {
            siteBooking.setPayMoney(playCoin.doubleValue());
        }else{
        } else {
            siteBooking.setPayMoney(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
        }
        siteBooking.setUserCouponId(reservationSite.getCouponId());
@@ -871,7 +885,7 @@
        siteBooking.setState(1);
        siteBooking.setTargetAudience(reservationSite.getTargetAudience());
        siteBooking.setInsertTime(new Date());
        siteBooking.setMoney(money+","+playCoin);
        siteBooking.setMoney(money + "," + playCoin);
        siteBooking.setNextName(reservationSite.getNextName());
        siteBooking.setIsHalf(reservationSite.getIsHalf());
        siteBooking.setHalfName(reservationSite.getHalfName());
@@ -1096,7 +1110,7 @@
        pageNo = (pageNo - 1) * pageSize;
        List<QueryMySiteVo> queryMySiteVos = this.baseMapper.queryMySite(uid, status, pageNo, pageSize);
        for (QueryMySiteVo queryMySiteVo : queryMySiteVos) {
            if (queryMySiteVo.getTargetAudience()==null){
            if (queryMySiteVo.getTargetAudience() == null) {
                queryMySiteVo.setTargetAudience(1);
            }
            SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
@@ -1127,7 +1141,7 @@
//                    }
                    if (querySiteTime.getTime().equals(time)) {
                        money = money.add(querySiteTime.getCashPrice());
                        playCoin = playCoin+querySiteTime.getCoinPrice();
                        playCoin = playCoin + querySiteTime.getCoinPrice();
                        break;
                    }
                }
@@ -1154,9 +1168,9 @@
        if (siteBooking.getTargetAudience() == 1 && format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
            return ResultUtil.error("预约当天，不能取消");
        }
        if (siteBooking.getTargetAudience() == 2){
        if (siteBooking.getTargetAudience() == 2) {
            Date date = new Date();
            if (siteBooking.getEndTime().before( date)){
            if (siteBooking.getEndTime().before(date)) {
                return ResultUtil.error("已过期，不能取消");
            }
        }
@@ -1291,7 +1305,7 @@
                String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
                if (querySiteTime.getTime().equals(time)) {
                    money = money.add(querySiteTime.getCashPrice());
                    playCoin = playCoin+querySiteTime.getCoinPrice();
                    playCoin = playCoin + querySiteTime.getCoinPrice();
                    break;
                }
            }
@@ -1327,9 +1341,9 @@
        siteBooking.setOrderNo(sdf.format(new Date()) + UUIDUtil.getNumberRandom(3));

        siteBooking.setPayType(payType);
        if (payType==3){
        if (payType == 3) {
            siteBooking.setPayMoney(playCoin.doubleValue());
        }else{
        } else {
            siteBooking.setPayMoney(money.doubleValue());
        }
        if (payType == 3) {
@@ -1379,7 +1393,7 @@
                String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
                if (querySiteTime.getTime().equals(time)) {
                    money = money.add(querySiteTime.getCashPrice());
                    playCoin = playCoin+querySiteTime.getCoinPrice();
                    playCoin = playCoin + querySiteTime.getCoinPrice();
                    break;
                }
            }
@@ -1403,7 +1417,7 @@
                money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
            }
        }
        switch (siteBooking.getPayType()){
        switch (siteBooking.getPayType()) {
            case 1:
                map.put("cash", money.doubleValue());
                break;