更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java

@@ -1,5 +1,6 @@
package com.dsh.account.service.impl;

import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +48,9 @@
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;

@@ -100,6 +104,8 @@
    @Resource
    private ParticipantClient participantClient;

    @Autowired
    private CoursePackageClient coursePackageClient;

    @Autowired
    private PayMoneyUtil payMoneyUtil;
@@ -115,13 +121,12 @@
    private TCourseInfoRecordService courseInfoRecordService;



    @Override
    public ResultUtil addStuOfAppUser(StuDetailsReq stu,Integer appUserId) throws Exception {
    public ResultUtil addStuOfAppUser(StuDetailsReq stu, Integer appUserId) throws Exception {
        TStudent student = new TStudent();
        if(ToolUtil.isNotEmpty(stu.getName()) && ToolUtil.isNotEmpty(stu.getIdCard())){
        if (ToolUtil.isNotEmpty(stu.getName()) && ToolUtil.isNotEmpty(stu.getIdCard())) {
            Boolean aBoolean = JuHeUtil.idcardAuthentication(stu.getIdCard(), stu.getName());
            if(!aBoolean){
            if (!aBoolean) {
                return ResultUtil.error("身份证和姓名不匹配");
            }
        }
@@ -130,7 +135,7 @@
        student.setHeadImg(stu.getHeadImg());
        student.setPhone(ToolUtil.isNotEmpty(stu.getPhone()) ? stu.getPhone() : "");
        student.setSex(stu.getSex());
        student.setIdCard(ToolUtil.isNotEmpty(stu.getIdCard())?stu.getIdCard() : "");
        student.setIdCard(ToolUtil.isNotEmpty(stu.getIdCard()) ? stu.getIdCard() : "");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        student.setBirthday(sdf.parse(stu.getBirthday()));
        student.setHeight(stu.getHeight());
@@ -146,9 +151,9 @@
        student.setState(1);

        List<TStudent> tStudents = this.baseMapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, appUserId));
        if(tStudents.size()>0){
        if (tStudents.size() > 0) {
            student.setIsDefault(2);
        }else {
        } else {
            student.setIsDefault(1);
        }
        this.baseMapper.insert(student);
@@ -163,6 +168,7 @@
        saveParticipant.setWeight(student.getWeight());
        saveParticipant.setPhone(student.getPhone());
        saveParticipant.setIdcard(student.getIdCard());

        participantClient.saveParticipant(saveParticipant);
        return ResultUtil.success();
    }
@@ -179,7 +185,7 @@
        getStuSessionList.setAppUserId(userIdFormRedis);
        List<StuSessionDetailsVo> stuSessionList = sessionNameClient.getStuSessionList(getStuSessionList);
        TStudent tStudent = this.baseMapper.selectById(stuId);
        if (ToolUtil.isNotEmpty(tStudent)){
        if (ToolUtil.isNotEmpty(tStudent)) {
            insVo.setStuId(tStudent.getId());
            insVo.setStuName(tStudent.getName());
            insVo.setStuImage(tStudent.getHeadImg());
@@ -203,10 +209,10 @@
            List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
            purchaseRecordVoList.addAll(purchaseRecordVos);
            List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
                    .eq("referralUserId",userIdFormRedis )
                    .between("insertTime",localMonthStart ,localMonthEnd));
                    .eq("referralUserId", userIdFormRedis)
                    .between("insertTime", localMonthStart, localMonthEnd));
            List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
            IntrduceOfUserRequest request  = new IntrduceOfUserRequest();
            IntrduceOfUserRequest request = new IntrduceOfUserRequest();
            request.setStartTime(localMonthStart);
            request.setEndTime(localMonthEnd);
            request.setUserIds(userIds);
@@ -233,101 +239,9 @@
    }

    @Override
    public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId) {
        List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>();
        String time = timeRequest.getTime();
        Date monthStart = null;
        Date monthEnd = null;
        if (StringUtils.hasText(time)) {
            monthStart = DateTimeHelper.getCurrentIdetMouthStart(time);
            monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(time);
        } else {
            monthStart = DateTimeHelper.getCurrentMouthStart();
            monthEnd = DateTimeHelper.getCurrentMouthEnd();
        }

        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
        Date startTime = DateTimeHelper.getCurrentIdetMouthStart(simpleDateFormat.format(monthStart));
        Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(simpleDateFormat.format(monthEnd));
        GetStuSourseList getStuSourseList = new GetStuSourseList();
        getStuSourseList.setStartTime(startTime);
        getStuSourseList.setEndTime(endTime);
        getStuSourseList.setAppUserId(appUserId);
        // 报名赛事
        List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
        purchaseRecordVoList.addAll(stuSourseList);

        GetStuSessionList sessionList = new GetStuSessionList();
        sessionList.setStartTime(startTime);
        sessionList.setEndTime(endTime);
        sessionList.setStuId(timeRequest.getStuId());
        sessionList.setAppUserId(appUserId);
        List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(sessionList);

        purchaseRecordVoList.addAll(cancelCourseList);
        GetStuSessionList getStuSessionList = new GetStuSessionList();
        getStuSessionList.setStartTime(startTime);
        getStuSessionList.setEndTime(endTime);
        getStuSessionList.setStuId(timeRequest.getStuId());
        getStuSessionList.setAppUserId(appUserId);
        // 购买课包
        List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
        purchaseRecordVoList.addAll(purchaseRecordVos);
        List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
                .eq("referralUserId",appUserId )
                .between("insertTime",startTime ,endTime));
        if (ToolUtil.isNotEmpty(tAppUsers)){
            List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
            IntrduceOfUserRequest request  = new IntrduceOfUserRequest();
            request.setStartTime(startTime);
            request.setEndTime(endTime);
            request.setUserIds(userIds);
            // 介绍有礼
            List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
            purchaseRecordVoList.addAll(purchaseRecordVos1);
        }

        LambdaQueryWrapper<TCourseInfoRecord> eq = new LambdaQueryWrapper<TCourseInfoRecord>().eq(TCourseInfoRecord::getUserId, appUserId);
        if(timeRequest.getType()!=null){
            eq.eq(TCourseInfoRecord::getType,timeRequest.getType());
        }
        // 2.0其他记录
        List<TCourseInfoRecord> list = courseInfoRecordService.list(eq);
        List<PurchaseRecordVo> list1=new ArrayList<>();
        for (TCourseInfoRecord tCourseInfoRecord : list) {
            PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
            purchaseRecordVo.setPurchaseTime(new SimpleDateFormat("MM-dd HH:mm").format(tCourseInfoRecord.getTime()));
            purchaseRecordVo.setPurchaseType(tCourseInfoRecord.getName());
            if(tCourseInfoRecord.getType()==1){
                purchaseRecordVo.setPurchaseAmount("+"+tCourseInfoRecord.getNum());
            }else {
                purchaseRecordVo.setPurchaseAmount("-"+tCourseInfoRecord.getNum());
            }
            list1.add(purchaseRecordVo);
        }
        purchaseRecordVoList.addAll(list1);

        if (purchaseRecordVoList.size() > 0 ){
            purchaseRecordVoList = purchaseRecordVoList.stream()
                    .filter(record -> {
                        String fieldValue = record.getPurchaseAmount();
                        if (ToolUtil.isNotEmpty(timeRequest.getType())){
                            switch (timeRequest.getType()){
                                case 1:
                                    return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '-';
                                case 2:
                                    return fieldValue != null && !fieldValue.isEmpty() && fieldValue.charAt(0) == '+';
                                default:
                                    break;
                            }
                        }
                        return false;
                    })
                    .collect(Collectors.toList());
        }

        purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
        return purchaseRecordVoList;
    public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest, Integer appUserId) {
        List<PurchaseRecordVo> record1 = sessionNameClient.getRecord(timeRequest);
        return record1;
    }

    @Override
@@ -408,7 +322,7 @@
        List<StuListVo> stuListVos = new ArrayList<>();
        List<TStudent> tStudents = this.baseMapper.selectList(new QueryWrapper<TStudent>()
                .eq("appUserId", appUserId)
                .eq("state",1));
                .eq("state", 1));
        if (tStudents.size() > 0) {
            tStudents.forEach(sts -> {
                if (Objects.equals(sts.getId(), stuId)) {
@@ -479,12 +393,12 @@
        try {
            switch (request.getPayType()) {
                case 1:
                    return WeChatPayment(code,request.getPayAmount(),hour);
                    return WeChatPayment(code, request.getPayAmount(), hour);
                case 2:
                    return AlipayPayment(code,request.getPayAmount(),hour);
                    return AlipayPayment(code, request.getPayAmount(), hour);
                case 3:
                    int i = PlaypaiGoldPayment(code,request);
                    switch (i){
                    int i = PlaypaiGoldPayment(code, request);
                    switch (i) {
                        case 1:
                            return ResultUtil.success();
                        case 2:
@@ -497,33 +411,33 @@
                default:
                    break;
            }
        }catch (Exception e){
        } catch (Exception e) {
            ResultUtil.runErr();
        }
        return ResultUtil.success();
    }


    public ResultUtil WeChatPayment(String code,BigDecimal amount,Integer hour) throws Exception {
    public ResultUtil WeChatPayment(String code, BigDecimal amount, Integer hour) throws Exception {
        ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, amount.toString(),
                "/base/coursePackage/wechatPaymentCallback", "APP", "");
        if(weixinpay.getCode() == 200){
        if (weixinpay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        int num = 1;
                        int wait = 0;
                        while (num <= 10){
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
                            if(coursePackagePayment.getPayStatus() == 2){
                            if (coursePackagePayment.getPayStatus() == 2) {
                                break;
                            }
                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
                            if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
                            if (resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1) {
                                /**
                                 * SUCCESS—支付成功，
                                 * REFUND—转入退款，
@@ -536,12 +450,12 @@
                                Map<String, String> data1 = resultUtil.getData();
                                String s = data1.get("trade_state");
                                String transaction_id = data1.get("transaction_id");
                                if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
                                if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
                                    coursePackagePayment.setState(3);
                                    couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
                                    break;
                                }
                                if("SUCCESS".equals(s)){
                                if ("SUCCESS".equals(s)) {
                                    coursePackagePayment.setPayStatus(2);
                                    coursePackagePayment.setTotalClassHours(hour);
                                    coursePackagePayment.setLaveClassHours(hour);
@@ -549,12 +463,12 @@
                                    couPayClient.updatePaymentCoursePackage(coursePackagePayment);
                                    break;
                                }
                                if("USERPAYING".equals(s)){
                                if ("USERPAYING".equals(s)) {
                                    num++;
                                }
                            }
                        }
                    }catch (Exception e){
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -562,55 +476,87 @@
        }
        return weixinpay;
    }
    private String smid = "2088330203191220";//平台支付宝商户号
    public ResultUtil AlipayPayment(String code, BigDecimal amount, Integer hour) {
        TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
        // 判断这个课包是属于哪个运营商的
        CoursePackage coursePackage = coursePackageClient.queryCoursePackageById(coursePackageId);
        Integer storeId = coursePackage.getStoreId();
        Store store = storeClient.queryStoreById(storeId);
        String smid1= "";
        if (store.getOperatorId()==null){
            // 平台
            smid1 = smid;
        }else{
            String smidByOperatorId = storeClient.getSMIDByOperatorId(store.getOperatorId());
            smid1 = smidByOperatorId;
        }

    public ResultUtil AlipayPayment(String code,BigDecimal amount,Integer hour){
        ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, amount.toString(),
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"课包续费", "课包续费", "", code, amount.toString(),
                "/base/coursePackage/alipayPaymentCallback");
        if(alipay.getCode() == 200){
        if (alipay.getCode() == 200) {
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        int num = 1;
                        int wait = 0;
                        while (num <= 10){
                        while (num <= 10) {
                            int min = 5000;
                            wait += (min * num);
                            Thread.sleep(wait);
                            TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
                            if(coursePackagePayment.getPayStatus() == 2){
                            if (coursePackagePayment.getPayStatus() == 2) {
                                break;
                            }
                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
                            if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
                            AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
                            if (resultUtil.getCode().equals("10000") && coursePackagePayment.getPayStatus() == 1) {
                                /**
                                 * WAIT_BUYER_PAY（交易创建，等待买家付款）、
                                 * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
                                 * TRADE_SUCCESS（交易支付成功）、
                                 * TRADE_FINISHED（交易结束，不可退款）
                                 */
                                Map<String, String> data1 = resultUtil.getData();
                                String s = data1.get("tradeStatus");
                                String tradeNo = data1.get("tradeNo");
                                if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
//                                Map<String, String> data1 = resultUtil.getData();
//                                String s = data1.get("tradeStatus");
//                                String tradeNo = data1.get("tradeNo");
                                String tradeNo = resultUtil.getTradeNo();
                                String tradeStatus = resultUtil.getTradeStatus();
                                System.out.println("ssssss" + tradeStatus);
                                if ("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus) || num == 10) {
                                    coursePackagePayment.setState(3);
                                    couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
                                    break;
                                }
                                if("TRADE_SUCCESS".equals(s)){
                                if ("TRADE_SUCCESS".equals(tradeStatus)) {
                                    coursePackagePayment.setPayStatus(2);
                                    coursePackagePayment.setTotalClassHours(hour);
                                    coursePackagePayment.setLaveClassHours(hour);
                                    coursePackagePayment.setOrderNumber(tradeNo);
                                    couPayClient.updatePaymentCoursePackage(coursePackagePayment);
                                    Integer coursePackageId = coursePackagePayment.getCoursePackageId();
                                    // 判断这个课包是属于哪个运营商的
                                    CoursePackage coursePackage = coursePackageClient.queryCoursePackageById(coursePackageId);
                                    Integer storeId = coursePackage.getStoreId();
                                    Store store = storeClient.queryStoreById(storeId);
                                    String smid1= "";
                                    if (store.getOperatorId()==null){
                                        // 平台
                                        smid1 = smid;
                                    }else{
                                        String smidByOperatorId = storeClient.getSMIDByOperatorId(store.getOperatorId());
                                        smid1 = smidByOperatorId;
                                    }
                                    payMoneyUtil.confirm(smid1,code,tradeNo,amount.toString());
                                    break;
                                }
                                if("WAIT_BUYER_PAY".equals(s)){
                                if ("WAIT_BUYER_PAY".equals(tradeStatus)) {
                                    num++;
                                }
                            }
                        }
                    }catch (Exception e){
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }
@@ -619,7 +565,7 @@
        return alipay;
    }

    public int PlaypaiGoldPayment(String code,ClasspaymentRequest request){
    public int PlaypaiGoldPayment(String code, ClasspaymentRequest request) {
        PlayPaiGoldCoursePackage paiGoldCoursePackage = new PlayPaiGoldCoursePackage();
        paiGoldCoursePackage.setCoursePackageId(request.getLessonId());
        paiGoldCoursePackage.setStuId(request.getStuId());
@@ -632,7 +578,7 @@
    @Override
    public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
        TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
        if(coursePackagePayment.getPayStatus() != 1){
        if (coursePackagePayment.getPayStatus() != 1) {
            return ResultUtil.success();
        }
        coursePackagePayment.setPayStatus(2);
@@ -642,16 +588,15 @@
    }

    /**
     *
     * @param stuId 学员id
     * @param appUserId 用户id
     * @param appointStatus  预约状态 0=全部 1=待上课 2=已完成 3=已取消
     * @param timeType 时间类型 0=全部 1=近一周 2=近一个月 3=近一年
     * @param search 课程名称
     * @param stuId         学员id
     * @param appUserId     用户id
     * @param appointStatus 预约状态 0=全部 1=待上课 2=已完成 3=已取消
     * @param timeType      时间类型 0=全部 1=近一周 2=近一个月 3=近一年
     * @param search        课程名称
     * @return
     */
    @Override
    public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId,Integer appointStatus,Integer timeType,String search,Integer pageNum) {
    public List<RecordAppoint> getAppointmentRecords(Integer stuId, Integer appUserId, Integer appointStatus, Integer timeType, String search, Integer pageNum) {
        WeeksOfCourseRest courseRest = new WeeksOfCourseRest();
        courseRest.setAppUserId(appUserId);
        courseRest.setStuId(stuId);
@@ -659,60 +604,102 @@
        List<RecordAppoint> recordAppoints = couPayClient.obtainStudentClassDetailsData(courseRest);
        if (recordAppoints.size() > 0) {
            if (ToolUtil.isNotEmpty(appointStatus) && appointStatus != 0) {
                if (appointStatus == 2) {
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(3))
                            .collect(Collectors.toList());
                } else if (appointStatus == 3) {
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(4))
                            .collect(Collectors.toList());
                } else {

                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getStatus().equals(appointStatus))
                            .collect(Collectors.toList());
                }
            }
            if (ToolUtil.isNotEmpty(search)) {
                    recordAppoints = recordAppoints.stream()
                            .filter(record -> record.getCoursePackageName().contains(search))
                            .collect(Collectors.toList());
                recordAppoints = recordAppoints.stream()
                        .filter(record -> record.getCoursePackageName().contains(search))
                        .collect(Collectors.toList());
            }

            if (ToolUtil.isNotEmpty(timeType) && timeType != 0) {
                Date lastOfDate = DateUtil.getLastOfDate();
//                Date lastOfDate = DateUtil.getLastOfDate();
                Date lastOfDate = DateUtil.getDate();
                switch (timeType) {
                    case 1:
                        Date lastWeekStartDate = DateUtil.getLastWeekStartDate();
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
                                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                            Date time = sdf.parse(record.getTimeFrame().substring(11));
                                            return !time.before(lastWeekStartDate) && !time.after(lastOfDate);
                                        } catch (ParseException e) {
                                            return false;
                                        }
                                    })
                                    .collect(Collectors.toList());
                        recordAppoints = recordAppoints.stream()
                                .filter(record -> {
                                    try {
                                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                        String substring = record.getTimeFrame().substring(0,16);
                                        Date time = sdf.parse(substring);
                                        Instant instant = time.toInstant();
                                        LocalDate dateToCheck = instant.atZone(ZoneId.systemDefault()).toLocalDate();
                                        // 获取今天的日期
                                        LocalDate today = LocalDate.now();
                                        // 计算一周前的日期
                                        LocalDate oneWeekAgo = today.minusWeeks(1);
                                        // 计算一周后的日期
                                        LocalDate oneWeekLater = today.plusWeeks(1);
                                        return dateToCheck.isAfter(oneWeekAgo) && dateToCheck.isBefore(oneWeekLater);
                                    } catch (ParseException e) {
                                        e.printStackTrace();
                                        return false;
                                    }
                                })
                                .collect(Collectors.toList());
                        break;
                    case 2:
                        Date lastMonthStartDate = DateUtil.getLastMonthStartDate();
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
                                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                                            Date time = sdf.parse(record.getTimeFrame().substring(11));
                                            return !time.before(lastMonthStartDate) && !time.after(lastOfDate);
                                        } catch (ParseException e) {
                                            return false;
                                        }
                                    })
                                    .collect(Collectors.toList());
                        recordAppoints = recordAppoints.stream()
                                .filter(record -> {
                                    try {
                                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                        String substring = record.getTimeFrame().substring(0,16);
                                        Date time = sdf.parse(substring);
                                        Instant instant = time.toInstant();
                                        LocalDate dateToCheck = instant.atZone(ZoneId.systemDefault()).toLocalDate();
                                        // 获取今天的日期
                                        LocalDate today = LocalDate.now();
                                        // 计算一周前的日期
                                        LocalDate oneWeekAgo = today.minusMonths(1);
                                        // 计算一周后的日期
                                        LocalDate oneWeekLater = today.plusMonths(1);
                                        return dateToCheck.isAfter(oneWeekAgo) && dateToCheck.isBefore(oneWeekLater);
                                    } catch (ParseException e) {
                                        e.printStackTrace();
                                        return false;
                                    }
                                })
                                .collect(Collectors.toList());
                        break;
                    case 3:
                        Date lastYearStartDate = DateUtil.getLastYearStartDate();
                            recordAppoints = recordAppoints.stream()
                                    .filter(record -> {
                                        try {
                                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                            Date time = sdf.parse(record.getTimeFrame().substring(11));
                                            return !time.before(lastYearStartDate) && !time.after(lastOfDate);
                                        } catch (ParseException e) {
                                            return false;
                                        }
                                    })
                                    .collect(Collectors.toList());
                        recordAppoints = recordAppoints.stream()
                                .filter(record -> {
                                    try {
                                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                                        String substring = record.getTimeFrame().substring(0,16);
                                        Date time = sdf.parse(substring);
                                        Instant instant = time.toInstant();
                                        LocalDate dateToCheck = instant.atZone(ZoneId.systemDefault()).toLocalDate();
                                        // 获取今天的日期
                                        LocalDate today = LocalDate.now();
                                        // 计算一周前的日期
                                        LocalDate oneWeekAgo = today.minusYears(1);
                                        // 计算一周后的日期
                                        LocalDate oneWeekLater = today.plusYears(1);
                                        return dateToCheck.isAfter(oneWeekAgo) && dateToCheck.isBefore(oneWeekLater);
                                    } catch (ParseException e) {
                                        e.printStackTrace();
                                        return false;
                                    }
                                })
                                .collect(Collectors.toList());

                        break;
                    default:
@@ -726,7 +713,7 @@
    @Override
    public ResultUtil cancelReservationOfCourse(Integer courseStuRecordId) {
        Integer integer = crClient.cancelCourseRecordClass(courseStuRecordId);
        switch (integer){
        switch (integer) {
            case 1:
                ResultUtil.success();
                break;
@@ -741,32 +728,30 @@
    }

    /**
     *
     * @param space 1=升序/2=降序
     * @param cityCode 城市code
     * @param space     1=升序/2=降序
     * @param cityCode  城市code
     * @param latitude
     * @param longitude
     * @return
     */
    @Override
    public List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude,String search) {
    public List<StoreDetailList> queryStoreList(Integer space, String cityCode, String latitude, String longitude, String search) {
        StoreOfCitycodeResp citycodeResp = new StoreOfCitycodeResp();
        citycodeResp.setCityCode(cityCode);
        citycodeResp.setLongitude(latitude);
        citycodeResp.setLatitude(longitude);
        List<StoreDetailList> queryStoreList = storeClient.getQueryStoreList(citycodeResp);
        if (queryStoreList.size() > 0){
            if (ToolUtil.isEmpty(space) || space == 2){
        if (queryStoreList.size() > 0) {
            if (ToolUtil.isEmpty(space) || space ==1) {
                queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
            } else {
                queryStoreList = queryStoreList.stream()
                        .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed())
                        .collect(Collectors.toList());
            }else {
                queryStoreList =  queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
            }
            if (ToolUtil.isNotEmpty(search)){
                queryStoreList =  queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList());
            if (ToolUtil.isNotEmpty(search)) {
                queryStoreList = queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList());
            }

        }
        return queryStoreList;
    }
@@ -776,14 +761,14 @@
        Store store = storeClient.queryStoreById(storeId);
        StoreDetailsVo detailsVo = new StoreDetailsVo();
        String realPicture = store.getRealPicture();
        if (ToolUtil.isNotEmpty(realPicture)){
        if (ToolUtil.isNotEmpty(realPicture)) {
            String[] split = realPicture.split(",");
            detailsVo.setImages(Arrays.asList(split));
        }
        detailsVo.setStoreId(store.getId());
        detailsVo.setStoreName(store.getName());
        detailsVo.setStoreAddress(store.getAddress());
        detailsVo.setStoreTime(store.getStartTime() + "至" +store.getEndTime());
        detailsVo.setStoreTime(store.getStartTime() + "至" + store.getEndTime());
        detailsVo.setStoreInfo(store.getIntroduce());
        detailsVo.setLon(store.getLon());
        detailsVo.setLat(store.getLat());
@@ -791,6 +776,14 @@
        detailsVo.setVenueList(steClient.getAppUserSiteList(storeId));
        List<StoreOfCourseVo> storeOfCourseList = culisClient.getStoreOfCourseList(storeId);
        System.out.println(storeOfCourseList);
        for (StoreOfCourseVo storeOfCourseVo : storeOfCourseList) {
            if (storeOfCourseVo.getClassHours().equals("0")) {
                storeOfCourseVo.setClassHours(null);
            }
            if (storeOfCourseVo.getClassStartTime().equals("-")) {
                storeOfCourseVo.setClassStartTime(null);
            }
        }
        detailsVo.setCourseVoList(storeOfCourseList);
        return detailsVo;
    }
@@ -798,15 +791,15 @@
    @Override
    public ResultUtil commitEditStudentInfo(StuEditInfoReq stu, Integer userIdFormRedis) {
        TStudent tStudent = this.baseMapper.selectOne(new LambdaQueryWrapper<TStudent>()
                .eq(TStudent::getId,stu.getId())
                .eq(TStudent::getAppUserId,userIdFormRedis));
        if (ToolUtil.isEmpty(tStudent)){
                .eq(TStudent::getId, stu.getId())
                .eq(TStudent::getAppUserId, userIdFormRedis));
        if (ToolUtil.isEmpty(tStudent)) {
            ResultUtil.error("会员信息不存在！");
        }
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        tStudent.setHeadImg(stu.getHeadImg());
        tStudent.setName(stu.getName());
        tStudent.setPhone(ToolUtil.isEmpty(stu.getPhone()) ? "":stu.getPhone());
        tStudent.setPhone(ToolUtil.isEmpty(stu.getPhone()) ? "" : stu.getPhone());
        try {
            tStudent.setBirthday(simpleDateFormat.parse(stu.getBirthday()));
        } catch (ParseException e) {
@@ -815,7 +808,7 @@
        tStudent.setSex(stu.getSex());
        tStudent.setHeight(stu.getHeight());
        tStudent.setWeight(stu.getWeight());
        tStudent.setIdCard(ToolUtil.isEmpty(stu.getIdCard()) ? ""  : stu.getIdCard());
        tStudent.setIdCard(ToolUtil.isEmpty(stu.getIdCard()) ? "" : stu.getIdCard());
        this.baseMapper.updateById(tStudent);
        return ResultUtil.success();
    }
@@ -832,7 +825,7 @@

    @Override
    public void createHistory(CreateHistoryDto createHistoryDto) {
         this.baseMapper.createHistory(createHistoryDto);
        this.baseMapper.createHistory(createHistoryDto);
    }

    @Override
@@ -845,9 +838,23 @@
        return this.baseMapper.getGiftSelect(giftSearchDto);
    }

    @Resource
    private SiteClient siteClient;


    @Override
    public List<Map<String, Object>> queryCom(Integer id) {
        return this.baseMapper.queryCom(id);
        List<Map<String, Object>> maps = this.baseMapper.queryCom(id);
        for (Map<String, Object> map : maps) {
            Integer coachId = (Integer) map.get("coachId");
            System.err.println("==============XXXXXXXXXXXX"+coachId);
            if (coachId!=null) {
                User name = siteClient.queryUserName(coachId);
                map.put("name",name.getName());
            }
        }

    return maps;
    }